diff --git a/.gitignore b/.gitignore
index b57dd3d2058063ba2afabfaeae4dcf51ac19b7b2..fe89c74ab38864939d737fa40f8ff0671e5c6372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,4 @@ nbproject
data-autotest
/tests/coverage*
/tests/autoconfig*
-/tests/autotest*
+/tests/autotest*
\ No newline at end of file
diff --git a/3rdparty b/3rdparty
index a13af72fbe8983686fc47489a750e60319f68ac2..e312294ef62873df2b8c02e774f9dfe1b7fbc38d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
+Subproject commit e312294ef62873df2b8c02e774f9dfe1b7fbc38d
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 1cd2944483cb337e547296224881252ebd4fc9d2..f568afad4da44f87f4d74cd301cee93202c8aa9b 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -15,6 +15,14 @@ $mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
// make filelist
$files = array();
+// If a type other than directory is requested first load them.
+if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) {
+ $i["date"] = OCP\Util::formatDate($i["mtime"] );
+ $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
+ $files[] = $i;
+ }
+}
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) {
$i["date"] = OCP\Util::formatDate($i["mtime"] );
$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 05ab1722b3e4f5411bb32671bb69dd03582ecd86..99739cb4cee71461bf43d1a6f0e8143b7e8939a4 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -20,4 +20,4 @@ OC_Search::registerProvider('OC_Search_Provider_File');
\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
-\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
+\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a15f0588f9f3cec5ac8e589772e0809b132f7341..a79d34c9b23545ce3b9d042b0ebd529bd99a19a3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -708,14 +708,14 @@ function scanFiles(force, dir){
var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
scannerEventSource.listen('count',function(count){
- console.log(count + 'files scanned')
+ console.log(count + ' files scanned')
});
scannerEventSource.listen('folder',function(path){
console.log('now scanning ' + path)
});
scannerEventSource.listen('done',function(count){
scanFiles.scanning=false;
- console.log('done after ' + count + 'files');
+ console.log('done after ' + count + ' files');
});
}
scanFiles.scanning=false;
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 6da312ae75b4869c5cad297c5f32eda46f20d5ae..c1c94b99003f6d52dbf5bbb3736af9ed7bbf5c26 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} carpetes",
"1 file" => "1 fitxer",
"{count} files" => "{count} fitxers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
"Unable to rename file" => "No es pot canviar el nom del fitxer",
"Upload" => "Puja",
"File handling" => "Gestió de fitxers",
@@ -56,7 +57,7 @@
"0 is unlimited" => "0 és sense límit",
"Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
"Save" => "Desa",
-"New" => "Nova",
+"New" => "Nou",
"Text file" => "Fitxer de text",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 626af36c2b60f9bf8a64cfd522623e5e48b5ef87..3c06c1ac83de1c42c3b3bf7be0dff05761723656 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} Ordner",
"1 file" => "1 Datei",
"{count} files" => "{count} Dateien",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
"Unable to rename file" => "Konnte Datei nicht umbenennen",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index a8bb96cdfc8cf818b84784c65d776746c98222af..b273f6b522dde74280b8fdf35be2ba7bb094b7da 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} φάκελοι",
"1 file" => "1 αρχείο",
"{count} files" => "{count} αρχεία",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud",
"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
"Upload" => "Μεταφόρτωση",
"File handling" => "Διαχείριση αρχείων",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 2aee432b10bcc69d1c84422f5fc103fd82a18691..b11adfabeb3e0b67204d02f38ac274bd54f2adf0 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} carpetas",
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud",
"Unable to rename file" => "No se puede renombrar el archivo",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index af6cf96161269ac8d77809e80876a50aba04bd6a..0ae47302edf7f020ab8e603e88178b5ff7bf602d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} directorios",
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 2214c4d3370f7477e861926c0381f60a55068e48..d3fab4b0bd167e59a03f3f9e0f1f620a155b850c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -3,7 +3,7 @@
"Could not move %s" => "%s liigutamine ebaõnnestus",
"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
"The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
"No file was uploaded" => "Ühtegi faili ei laetud üles",
@@ -24,18 +24,18 @@
"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
"undo" => "tagasi",
"perform delete operation" => "teosta kustutamine",
-"1 file uploading" => "1 faili üleslaadimisel",
-"files uploading" => "failide üleslaadimine",
+"1 file uploading" => "1 fail üleslaadimisel",
+"files uploading" => "faili üleslaadimisel",
"'.' is an invalid file name." => "'.' on vigane failinimi.",
"File name cannot be empty." => "Faili nimi ei saa olla tühi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!",
+"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. ",
+"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
"Not enough space available" => "Pole piisavalt ruumi",
"Upload cancelled." => "Üleslaadimine tühistati.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
"URL cannot be empty." => "URL ei saa olla tühi.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
"Error" => "Viga",
@@ -46,6 +46,7 @@
"{count} folders" => "{count} kausta",
"1 file" => "1 fail",
"{count} files" => "{count} faili",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
"Upload" => "Lae üles",
"File handling" => "Failide käsitlemine",
@@ -68,7 +69,7 @@
"Unshare" => "Lõpeta jagamine",
"Upload too large" => "Üleslaadimine on liiga suur",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
-"Files are being scanned, please wait." => "Faile skannitakse, palun oota",
+"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
"Current scanning" => "Praegune skannimine",
-"Upgrading filesystem cache..." => "Uuendan failisüsteemi puhvrit..."
+"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
);
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 5620d86e48d0ba248920cfd2cfe781e0135185c0..39c697396c919c69a6349ae94f44b2f47c8f2882 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} dossiers",
"1 file" => "1 fichier",
"{count} files" => "{count} fichiers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
"Unable to rename file" => "Impossible de renommer le fichier",
"Upload" => "Envoyer",
"File handling" => "Gestion des fichiers",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 2352d9e15c4649af895cc7b00d92db22819f0f01..d22ed4b87215d156509866f3a81ac712d2c9b02f 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} cartafoles",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
"Unable to rename file" => "Non é posíbel renomear o ficheiro",
"Upload" => "Enviar",
"File handling" => "Manexo de ficheiro",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 4520bfdd085dd934fee131f490e5e3a19ebaf5c9..76b8bd420da8d84bb4813da057b27f7da3c7bcd1 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} mappa",
"1 file" => "1 fájl",
"{count} files" => "{count} fájl",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
"Unable to rename file" => "Nem lehet átnevezni a fájlt",
"Upload" => "Feltöltés",
"File handling" => "Fájlkezelés",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index d5eca524d8a7d3cf52570b6f04e3d7483c759570..c588285aacabab0d61dc185d882b4017fd224af2 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} cartelle",
"1 file" => "1 file",
"{count} files" => "{count} file",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
"Unable to rename file" => "Impossibile rinominare il file",
"Upload" => "Carica",
"File handling" => "Gestione file",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 021a21048704d69a27523fc98f215e1bdd0898e4..55dcf3640e7746d8d23a7cd00873474604fa32e9 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} フォルダ",
"1 file" => "1 ファイル",
"{count} files" => "{count} ファイル",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
"Unable to rename file" => "ファイル名の変更ができません",
"Upload" => "アップロード",
"File handling" => "ファイル操作",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 1ff21b1f0e23faf454b7759f120bc657de52fd7a..d5710a4927a07f438afa6531298606fdbd8a3593 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,11 +1,16 @@
<?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
+"Could not move %s" => "Kunne ikke flytte %s",
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
"No file was uploaded" => "Ingen filer ble lastet opp",
"Missing a temporary folder" => "Mangler midlertidig mappe",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
+"Not enough storage available" => "Ikke nok lagringsplass",
+"Invalid directory." => "Ugyldig katalog.",
"Files" => "Filer",
"Share" => "Del",
"Delete permanently" => "Slett permanent",
@@ -18,13 +23,21 @@
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
"undo" => "angre",
+"perform delete operation" => "utfør sletting",
"1 file uploading" => "1 fil lastes opp",
"files uploading" => "filer lastes opp",
+"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
+"File name cannot be empty." => "Filnavn kan ikke være tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Not enough space available" => "Ikke nok lagringsplass",
"Upload cancelled." => "Opplasting avbrutt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
"URL cannot be empty." => "URL-en kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
"Error" => "Feil",
"Name" => "Navn",
"Size" => "Størrelse",
@@ -33,6 +46,8 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
+"Unable to rename file" => "Kan ikke gi nytt navn",
"Upload" => "Last opp",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -46,12 +61,15 @@
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From link" => "Fra link",
+"Deleted files" => "Slettet filer",
"Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
"Unshare" => "Avslutt deling",
"Upload too large" => "Filen er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
-"Current scanning" => "Pågående skanning"
+"Current scanning" => "Pågående skanning",
+"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..."
);
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 430af50072f9d2d9046c360af129849f9c5abaa8..bc4158df3b3928befe482bbd8d5692f677d7de0a 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} mappen",
"1 file" => "1 bestand",
"{count} files" => "{count} bestanden",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
"Unable to rename file" => "Kan bestand niet hernoemen",
"Upload" => "Uploaden",
"File handling" => "Bestand",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 6d5c4c56425219ff9c63075765bc728e4f64237a..29593b6f2def50a7d86a473355100ec45ba099ad 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet",
-"Could not move %s" => "Klarte ikkje å flytta %s",
+"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+"Could not move %s" => "Klarte ikkje flytta %s",
"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
@@ -8,7 +8,7 @@
"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
"No file was uploaded" => "Ingen filer vart lasta opp",
"Missing a temporary folder" => "Manglar ei mellombels mappe",
-"Failed to write to disk" => "Klarte ikkje å skriva til disk",
+"Failed to write to disk" => "Klarte ikkje skriva til disk",
"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
@@ -32,11 +32,11 @@
"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
"Upload cancelled." => "Opplasting avbroten.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten.",
-"URL cannot be empty." => "URL-en kan ikkje vera tom.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
"Error" => "Feil",
"Name" => "Namn",
@@ -46,13 +46,14 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
-"Unable to rename file" => "Klarte ikkje å endra filnamnet",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
+"Unable to rename file" => "Klarte ikkje endra filnamnet",
"Upload" => "Last opp",
"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
"max. possible: " => "maks. moglege:",
-"Needed for multi-file and folder downloads." => "Naudsynt for fleirfils- og mappenedlastingar.",
-"Enable ZIP-download" => "Skru på ZIP-nedlasting",
+"Needed for multi-file and folder downloads." => "Nødvendig for fleirfils- og mappenedlastingar.",
+"Enable ZIP-download" => "Slå på ZIP-nedlasting",
"0 is unlimited" => "0 er ubegrensa",
"Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
"Save" => "Lagre",
@@ -67,7 +68,7 @@
"Download" => "Last ned",
"Unshare" => "Udel",
"Upload too large" => "For stor opplasting",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
"Current scanning" => "Køyrande skanning",
"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 65d9a4e4be249a2dd50745af4acd072510606342..4bdac05578189551de8da55cd84b5631ed25256c 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -46,6 +46,7 @@
"{count} folders" => "Ilość folderów: {count}",
"1 file" => "1 plik",
"{count} files" => "Ilość plików: {count}",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
"Unable to rename file" => "Nie można zmienić nazwy pliku",
"Upload" => "Wyślij",
"File handling" => "Zarządzanie plikami",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 7c68987652cfcaea66ad285773392b53bc660221..0f349b694812830acc2dec8a4a813cccfc419443 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 arquivo",
"{count} files" => "{count} arquivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
"Unable to rename file" => "Impossível renomear arquivo",
"Upload" => "Upload",
"File handling" => "Tratamento de Arquivo",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 15d6fc80bd36cec03e9c89bb6b5cd83653f1ebfb..d90e29997020968bf8a4333c62072af2258bd3ba 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
"Unable to rename file" => "Não foi possível renomear o ficheiro",
"Upload" => "Carregar",
"File handling" => "Manuseamento de ficheiros",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 400a0dc8de710ee60b14f6e718b45c97719ee2e3..e0bfab33215ff8036017e3b024630f40c148fe63 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,71 +1,16 @@
<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Неполучается перенести %s - Файл с таким именем уже существует",
-"Could not move %s" => "Неполучается перенести %s ",
-"Unable to rename file" => "Невозможно переименовать файл",
"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
-"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
+"There is no error, the file uploaded with success" => "Ошибки нет, файл успешно загружен",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен лишь частично",
"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствует временная папка",
+"Missing a temporary folder" => "Отсутствие временной папки",
"Failed to write to disk" => "Не удалось записать на диск",
"Not enough storage available" => "Недостаточно места в хранилище",
-"Invalid directory." => "Неверный каталог.",
-"Files" => "Файлы",
"Share" => "Сделать общим",
-"Delete permanently" => "Удалить навсегда",
"Delete" => "Удалить",
-"Rename" => "Переименовать",
-"Pending" => "Ожидающий решения",
-"{new_name} already exists" => "{новое_имя} уже существует",
-"replace" => "отмена",
-"suggest name" => "подобрать название",
-"cancel" => "отменить",
-"replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
-"undo" => "отменить действие",
-"perform delete operation" => "выполняется процесс удаления",
-"1 file uploading" => "загрузка 1 файла",
-"'.' is an invalid file name." => "'.' является неверным именем файла.",
-"File name cannot be empty." => "Имя файла не может быть пустым.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти полно ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
-"Not enough space available" => "Не достаточно свободного места",
-"Upload cancelled." => "Загрузка отменена",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
-"URL cannot be empty." => "URL не должен быть пустым.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud",
"Error" => "Ошибка",
"Name" => "Имя",
-"Size" => "Размер",
-"Modified" => "Изменен",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Upload" => "Загрузить ",
-"File handling" => "Работа с файлами",
-"Maximum upload size" => "Максимальный размер загружаемого файла",
-"max. possible: " => "Максимально возможный",
-"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.",
-"Enable ZIP-download" => "Включение ZIP-загрузки",
-"0 is unlimited" => "0 без ограничений",
-"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ",
"Save" => "Сохранить",
-"New" => "Новый",
-"Text file" => "Текстовый файл",
-"Folder" => "Папка",
-"From link" => "По ссылке",
-"Cancel upload" => "Отмена загрузки",
-"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Download" => "Загрузить",
-"Unshare" => "Скрыть",
-"Upload too large" => "Загрузка слишком велика",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",
-"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.",
-"Current scanning" => "Текущее сканирование",
-"Upgrading filesystem cache..." => "Обновление кэша файловой системы... "
+"Download" => "Загрузка"
);
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index b7f329c3626dbfc59603487210cf1ec1668c3eaa..ad33c9b4eeedcbda5a008fbe6d6ea498bf882878 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} priečinkov",
"1 file" => "1 súbor",
"{count} files" => "{count} súborov",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
"Unable to rename file" => "Nemožno premenovať súbor",
"Upload" => "Odoslať",
"File handling" => "Nastavenie správania sa k súborom",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index fd5c6bc6f09faccf190e7c14b25c215aaeb303f5..6a096d270391fb5947399848f0d6b8c5b81a33e8 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} dizin",
"1 file" => "1 dosya",
"{count} files" => "{count} dosya",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
"Unable to rename file" => "Dosya adı değiştirilemedi",
"Upload" => "Yükle",
"File handling" => "Dosya taşıma",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index d5d2b84d123fff3a66b71468f1d615689cac8b07..c883670e8485f22440438ae3580e36512d4b231c 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} 个文件夹",
"1 file" => "1 个文件",
"{count} files" => "{count} 个文件",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
"Unable to rename file" => "无法重命名文件",
"Upload" => "上传",
"File handling" => "文件处理",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 600048a321c41172531177aa52360b9e1d11957e..0bd207888dc9420479098f7e982e407ef7c96543 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} 個資料夾",
"1 file" => "1 個檔案",
"{count} files" => "{count} 個檔案",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
"Unable to rename file" => "無法重新命名檔案",
"Upload" => "上傳",
"File handling" => "檔案處理",
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 7ea1755d1d7459c8ac8ce2d01c8013328e876671..9886b42e42463f5b34057ebb9677831bbdcceb50 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,5 +1,5 @@
<?php if(count($_["breadcrumb"])):?>
- <div class="crumb">
+ <div class="crumb" data-dir=''>
<a href="<?php print_unescaped($_['baseURL']); ?>">
<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
</a>
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ccacb963e3c535182eba8f5f74470c86abdfc6d
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
@@ -0,0 +1,317 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+require_once 'PEAR.php';
+
+
+/**
+ *
+ * Example usage:
+ * $bf = new Crypt_Blowfish('some secret key!');
+ * $encrypted = $bf->encrypt('this is some example plain text');
+ * $plaintext = $bf->decrypt($encrypted);
+ * echo "plain text: $plaintext";
+ *
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ * @version @package_version@
+ * @access public
+ */
+class Crypt_Blowfish
+{
+ /**
+ * P-Array contains 18 32-bit subkeys
+ *
+ * @var array
+ * @access private
+ */
+ var $_P = array();
+
+
+ /**
+ * Array of four S-Blocks each containing 256 32-bit entries
+ *
+ * @var array
+ * @access private
+ */
+ var $_S = array();
+
+ /**
+ * Mcrypt td resource
+ *
+ * @var resource
+ * @access private
+ */
+ var $_td = null;
+
+ /**
+ * Initialization vector
+ *
+ * @var string
+ * @access private
+ */
+ var $_iv = null;
+
+
+ /**
+ * Crypt_Blowfish Constructor
+ * Initializes the Crypt_Blowfish object, and gives a sets
+ * the secret key
+ *
+ * @param string $key
+ * @access public
+ */
+ function Crypt_Blowfish($key)
+ {
+ if (extension_loaded('mcrypt')) {
+ $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
+ $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
+ }
+ $this->setKey($key);
+ }
+
+ /**
+ * Deprecated isReady method
+ *
+ * @return bool
+ * @access public
+ * @deprecated
+ */
+ function isReady()
+ {
+ return true;
+ }
+
+ /**
+ * Deprecated init method - init is now a private
+ * method and has been replaced with _init
+ *
+ * @return bool
+ * @access public
+ * @deprecated
+ * @see Crypt_Blowfish::_init()
+ */
+ function init()
+ {
+ $this->_init();
+ }
+
+ /**
+ * Initializes the Crypt_Blowfish object
+ *
+ * @access private
+ */
+ function _init()
+ {
+ $defaults = new Crypt_Blowfish_DefaultKey();
+ $this->_P = $defaults->P;
+ $this->_S = $defaults->S;
+ }
+
+ /**
+ * Enciphers a single 64 bit block
+ *
+ * @param int &$Xl
+ * @param int &$Xr
+ * @access private
+ */
+ function _encipher(&$Xl, &$Xr)
+ {
+ for ($i = 0; $i < 16; $i++) {
+ $temp = $Xl ^ $this->_P[$i];
+ $Xl = ((($this->_S[0][($temp>>24) & 255] +
+ $this->_S[1][($temp>>16) & 255]) ^
+ $this->_S[2][($temp>>8) & 255]) +
+ $this->_S[3][$temp & 255]) ^ $Xr;
+ $Xr = $temp;
+ }
+ $Xr = $Xl ^ $this->_P[16];
+ $Xl = $temp ^ $this->_P[17];
+ }
+
+
+ /**
+ * Deciphers a single 64 bit block
+ *
+ * @param int &$Xl
+ * @param int &$Xr
+ * @access private
+ */
+ function _decipher(&$Xl, &$Xr)
+ {
+ for ($i = 17; $i > 1; $i--) {
+ $temp = $Xl ^ $this->_P[$i];
+ $Xl = ((($this->_S[0][($temp>>24) & 255] +
+ $this->_S[1][($temp>>16) & 255]) ^
+ $this->_S[2][($temp>>8) & 255]) +
+ $this->_S[3][$temp & 255]) ^ $Xr;
+ $Xr = $temp;
+ }
+ $Xr = $Xl ^ $this->_P[1];
+ $Xl = $temp ^ $this->_P[0];
+ }
+
+
+ /**
+ * Encrypts a string
+ *
+ * @param string $plainText
+ * @return string Returns cipher text on success, PEAR_Error on failure
+ * @access public
+ */
+ function encrypt($plainText)
+ {
+ if (!is_string($plainText)) {
+ PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ return mcrypt_generic($this->_td, $plainText);
+ }
+
+ $cipherText = '';
+ $len = strlen($plainText);
+ $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
+ for ($i = 0; $i < $len; $i += 8) {
+ list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
+ $this->_encipher($Xl, $Xr);
+ $cipherText .= pack("N2", $Xl, $Xr);
+ }
+ return $cipherText;
+ }
+
+
+ /**
+ * Decrypts an encrypted string
+ *
+ * @param string $cipherText
+ * @return string Returns plain text on success, PEAR_Error on failure
+ * @access public
+ */
+ function decrypt($cipherText)
+ {
+ if (!is_string($cipherText)) {
+ PEAR::raiseError('Cipher text must be a string', 1, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ return mdecrypt_generic($this->_td, $cipherText);
+ }
+
+ $plainText = '';
+ $len = strlen($cipherText);
+ $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
+ for ($i = 0; $i < $len; $i += 8) {
+ list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
+ $this->_decipher($Xl, $Xr);
+ $plainText .= pack("N2", $Xl, $Xr);
+ }
+ return $plainText;
+ }
+
+
+ /**
+ * Sets the secret key
+ * The key must be non-zero, and less than or equal to
+ * 56 characters in length.
+ *
+ * @param string $key
+ * @return bool Returns true on success, PEAR_Error on failure
+ * @access public
+ */
+ function setKey($key)
+ {
+ if (!is_string($key)) {
+ PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
+ }
+
+ $len = strlen($key);
+
+ if ($len > 56 || $len == 0) {
+ PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ mcrypt_generic_init($this->_td, $key, $this->_iv);
+ return true;
+ }
+
+ require_once 'Blowfish/DefaultKey.php';
+ $this->_init();
+
+ $k = 0;
+ $data = 0;
+ $datal = 0;
+ $datar = 0;
+
+ for ($i = 0; $i < 18; $i++) {
+ $data = 0;
+ for ($j = 4; $j > 0; $j--) {
+ $data = $data << 8 | ord($key{$k});
+ $k = ($k+1) % $len;
+ }
+ $this->_P[$i] ^= $data;
+ }
+
+ for ($i = 0; $i <= 16; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_P[$i] = $datal;
+ $this->_P[$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[0][$i] = $datal;
+ $this->_S[0][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[1][$i] = $datal;
+ $this->_S[1][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[2][$i] = $datal;
+ $this->_S[2][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[3][$i] = $datal;
+ $this->_S[3][$i+1] = $datar;
+ }
+
+ return true;
+ }
+
+}
+
+?>
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ff8ac788a6b62a4abde68d476c673612b8bfe01
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
@@ -0,0 +1,327 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+/**
+ * Class containing default key
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ * @version @package_version@
+ * @access public
+ */
+class Crypt_Blowfish_DefaultKey
+{
+ var $P = array();
+
+ var $S = array();
+
+ function Crypt_Blowfish_DefaultKey()
+ {
+ $this->P = array(
+ 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+ 0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+ 0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+ 0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+ 0x9216D5D9, 0x8979FB1B
+ );
+
+ $this->S = array(
+ array(
+ 0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+ 0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+ 0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+ 0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+ 0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+ 0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+ 0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+ 0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+ 0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+ 0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+ 0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+ 0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+ 0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+ 0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+ 0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+ 0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+ 0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+ 0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+ 0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+ 0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+ 0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+ 0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+ 0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+ 0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+ 0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+ 0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+ 0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+ 0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+ 0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+ 0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+ 0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+ 0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+ 0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+ 0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+ 0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+ 0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+ 0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+ 0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+ 0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+ 0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+ 0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+ 0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+ 0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+ 0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+ 0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+ 0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+ 0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+ 0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+ 0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+ 0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+ 0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+ 0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+ 0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+ 0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+ 0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+ 0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+ 0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+ 0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+ 0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+ 0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+ 0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+ 0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+ 0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+ 0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
+ ),
+ array(
+ 0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+ 0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+ 0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+ 0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+ 0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+ 0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+ 0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+ 0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+ 0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+ 0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+ 0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+ 0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+ 0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+ 0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+ 0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+ 0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+ 0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+ 0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+ 0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+ 0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+ 0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+ 0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+ 0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+ 0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+ 0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+ 0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+ 0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+ 0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+ 0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+ 0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+ 0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+ 0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+ 0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+ 0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+ 0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+ 0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+ 0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+ 0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+ 0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+ 0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+ 0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+ 0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+ 0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+ 0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+ 0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+ 0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+ 0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+ 0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+ 0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+ 0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+ 0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+ 0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+ 0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+ 0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+ 0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+ 0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+ 0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+ 0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+ 0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+ 0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+ 0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+ 0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+ 0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+ 0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
+ ),
+ array(
+ 0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+ 0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+ 0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+ 0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+ 0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+ 0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+ 0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+ 0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+ 0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+ 0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+ 0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+ 0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+ 0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+ 0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+ 0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+ 0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+ 0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+ 0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+ 0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+ 0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+ 0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+ 0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+ 0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+ 0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+ 0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+ 0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+ 0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+ 0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+ 0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+ 0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+ 0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+ 0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+ 0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+ 0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+ 0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+ 0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+ 0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+ 0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+ 0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+ 0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+ 0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+ 0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+ 0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+ 0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+ 0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+ 0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+ 0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+ 0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+ 0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+ 0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+ 0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+ 0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+ 0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+ 0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+ 0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+ 0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+ 0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+ 0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+ 0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+ 0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+ 0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+ 0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+ 0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+ 0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
+ ),
+ array(
+ 0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+ 0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+ 0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+ 0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+ 0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+ 0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+ 0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+ 0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+ 0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+ 0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+ 0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+ 0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+ 0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+ 0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+ 0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+ 0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+ 0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+ 0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+ 0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+ 0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+ 0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+ 0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+ 0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+ 0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+ 0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+ 0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+ 0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+ 0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+ 0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+ 0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+ 0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+ 0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+ 0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+ 0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+ 0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+ 0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+ 0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+ 0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+ 0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+ 0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+ 0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+ 0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+ 0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+ 0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+ 0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+ 0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+ 0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+ 0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+ 0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+ 0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+ 0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+ 0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+ 0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+ 0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+ 0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+ 0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+ 0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+ 0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+ 0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+ 0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+ 0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+ 0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+ 0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+ 0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
+ )
+ );
+ }
+
+}
+
+?>
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
new file mode 100644
index 0000000000000000000000000000000000000000..6a0186d5a9b1b14d343a486eeb3ac22903cccba9
--- /dev/null
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l = OC_L10N::get('files_encryption');
+
+$return = false;
+// Enable recoveryAdmin
+
+$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') {
+
+ $return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
+
+ // Return success or failure
+ if ($return) {
+ \OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully enabled'))));
+ } else {
+ \OCP\JSON::error(array(
+ 'data' => array(
+ 'message' => $l->t(
+ 'Could not enable recovery key. Please check your recovery key password!')
+ )
+ ));
+ }
+
+// Disable recoveryAdmin
+} elseif (
+ isset($_POST['adminEnableRecovery'])
+ && '0' === $_POST['adminEnableRecovery']
+) {
+ $return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
+
+ // Return success or failure
+ if ($return) {
+ \OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully disabled'))));
+ } else {
+ \OCP\JSON::error(array(
+ 'data' => array(
+ 'message' => $l->t(
+ 'Could not disable recovery key. Please check your recovery key password!')
+ )
+ ));
+ }
+}
+
+
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0594f967ba30c88ff067ef122ba8f4b445eca50
--- /dev/null
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Copyright (c) 2013, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to change recovery key password
+ *
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l = OC_L10N::get('core');
+
+$return = false;
+
+$oldPassword = $_POST['oldPassword'];
+$newPassword = $_POST['newPassword'];
+
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+
+$result = $util->checkRecoveryPassword($oldPassword);
+
+if ($result) {
+ $keyId = $util->getRecoveryKeyId();
+ $keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
+ $view = new \OC\Files\View('/');
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedRecoveryKey = $view->file_get_contents($keyPath);
+ $decryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricDecryptFileContent($encryptedRecoveryKey, $oldPassword);
+ $encryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword);
+ $view->file_put_contents($keyPath, $encryptedRecoveryKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $return = true;
+}
+
+// success or failure
+if ($return) {
+ \OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
+} else {
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
+}
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d0f1ac2d17219c044942f33cc84c6df36a296ab
--- /dev/null
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+if (
+ isset($_POST['userEnableRecovery'])
+ && (0 == $_POST['userEnableRecovery'] || '1' === $_POST['userEnableRecovery'])
+) {
+
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView('/');
+ $util = new \OCA\Encryption\Util($view, $userId);
+
+ // Save recovery preference to DB
+ $return = $util->setRecoveryForUser($_POST['userEnableRecovery']);
+
+ if ($_POST['userEnableRecovery'] === '1') {
+ $util->addRecoveryKeys();
+ } else {
+ $util->removeRecoveryKeys();
+ }
+
+} else {
+
+ $return = false;
+
+}
+
+// Return success or failure
+($return) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index bf16fec3aea0d60678d0a26d8121c9cbd0413868..99bdc2c24702fdea6f15ff29a78d2a225bcf0f67 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -8,42 +8,50 @@ OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
+OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
-OC_FileProxy::register( new OCA\Encryption\Proxy() );
+OC_FileProxy::register(new OCA\Encryption\Proxy());
-// User-related hooks
-OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+// User related hooks
+OCA\Encryption\Helper::registerUserHooks();
-// Sharing-related hooks
-OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshare', 'OCA\Encryption\Hooks', 'preUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
+// Sharing related hooks
+OCA\Encryption\Helper::registerShareHooks();
-// Webdav-related hooks
-OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
+// Filesystem related hooks
+OCA\Encryption\Helper::registerFilesystemHooks();
-stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
+stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
-$session = new OCA\Encryption\Session();
+// check if we are logged in
+if (OCP\User::isLoggedIn()) {
-if (
- ! $session->getPrivateKey( \OCP\USER::getUser() )
- && OCP\User::isLoggedIn()
- && OCA\Encryption\Crypt::mode() == 'server'
-) {
+ // ensure filesystem is loaded
+ if(!\OC\Files\Filesystem::$loaded) {
+ \OC_Util::setupFS();
+ }
- // Force the user to log-in again if the encryption key isn't unlocked
- // (happens when a user is logged in before the encryption app is
- // enabled)
- OCP\User::logout();
-
- header( "Location: " . OC::$WEBROOT.'/' );
-
- exit();
+ $view = new OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
+ // check if user has a private key
+ if (
+ !$session->getPrivateKey(\OCP\USER::getUser())
+ && OCA\Encryption\Crypt::mode() === 'server'
+ ) {
+
+ // Force the user to log-in again if the encryption key isn't unlocked
+ // (happens when a user is logged in before the encryption app is
+ // enabled)
+ OCP\User::logout();
+
+ header("Location: " . OC::$WEBROOT . '/');
+
+ exit();
+ }
}
// Register settings scripts
-OCP\App::registerAdmin( 'files_encryption', 'settings' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
+OCP\App::registerAdmin('files_encryption', 'settings-admin');
+OCP\App::registerPersonal('files_encryption', 'settings-personal');
+
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index d294c35d63d0052e14cc188cebb3603822113aac..4587930da0a3c25fb3eecbb4c39afebf9de866ec 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -18,6 +18,21 @@
<type>text</type>
<notnull>true</notnull>
<length>64</length>
+ <comments>What client-side / server-side configuration is used</comments>
+ </field>
+ <field>
+ <name>recovery_enabled</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <default>0</default>
+ <comments>Whether encryption key recovery is enabled</comments>
+ </field>
+ <field>
+ <name>migration_status</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <default>0</default>
+ <comments>Whether encryption migration has been performed</comments>
</field>
</declaration>
</table>
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 39ea155488f4f1944a152cc4b85b49bd0394b5fb..ea8f6cf6f310373685427f40ed18481c49c9d3c8 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,9 +2,9 @@
<info>
<id>files_encryption</id>
<name>Encryption</name>
- <description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
+ <description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. Encryption is not yet compatible with LDAP.</description>
<licence>AGPL</licence>
- <author>Sam Tuke</author>
+ <author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
<require>4</require>
<shipped>true</shipped>
<types>
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index 2d22dffe08da9d3e1a331aff5166aa9dfd05e16c..ddd3983a9eba2f2e33850d0fe57532093e7c7584 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -9,6 +9,57 @@ Encrypted files
[encrypted data string][delimiter][IV][padding]
[anhAAjAmcGXqj1X9g==][00iv00][MSHU5N5gECP7aAg7][xx] (square braces added)
+
+- Directory structure:
+ - Encrypted user data (catfiles) are stored in the usual /data/user/files dir
+ - Keyfiles are stored in /data/user/files_encryption/keyfiles
+ - Sharekey are stored in /data/user/files_encryption/share-files
+
+- File extensions:
+ - Catfiles have to keep the file extension of the original file, pre-encryption
+ - Keyfiles use .keyfile
+ - Sharekeys have .shareKey
+
+Shared files
+------------
+
+Shared files have a centrally stored catfile and keyfile, and one sharekey for
+each user that shares it.
+
+When sharing is used, a different encryption method is used to encrypt the
+keyfile (openssl_seal). Although shared files have a keyfile, its contents
+use a different format therefore.
+
+Each time a shared file is edited or deleted, all sharekeys for users sharing
+that file must have their sharekeys changed also. The keyfile and catfile
+however need only changing in the owners files, as there is only one copy of
+these.
+
+Publicly shared files (public links)
+------------------------------------
+
+Files shared via public links use a separate system user account called 'ownCloud'. All public files are shared to that user's public key, and the private key is used to access the files when the public link is used in browser.
+
+This means that files shared via public links are accessible only to users who know the shared URL, or to admins who know the 'ownCloud' user password.
+
+Lost password recovery
+----------------------
+
+In order to enable users to read their encrypted files in the event of a password loss/reset scenario, administrators can choose to enable a 'recoveryAdmin' account. This is a user that all user files will automatically be shared to of the option is enabled. This allows the recoveryAdmin user to generate new keyfiles for the user. By default the UID of the recoveryAdmin is 'recoveryAdmin'.
+
+OC_FilesystemView
+-----------------
+
+files_encryption deals extensively with paths and the filesystem. In order to minimise bugs, it makes calls to filesystem methods in a consistent way: OC_FilesystemView{} objects always use '/' as their root, and specify paths each time particular methods are called. e.g. do this:
+
+$view->file_exists( 'path/to/file' );
+
+Not:
+
+$view->chroot( 'path/to' );
+$view->file_exists( 'file' );
+
+Using this convention means that $view objects are more predictable and less likely to break. Problems with paths are the #1 cause of bugs in this app, and consistent $view handling is an important way to prevent them.
Notes
-----
@@ -16,4 +67,11 @@ Notes
- The user passphrase is required in order to set up or upgrade the app. New
keypair generation, and the re-encryption of legacy encrypted files requires
it. Therefore an appinfo/update.php script cannot be used, and upgrade logic
- is handled in the login hook listener.
\ No newline at end of file
+ is handled in the login hook listener. Therefore each time the user logs in
+ their files are scanned to detect unencrypted and legacy encrypted files, and
+ they are (re)encrypted as necessary. This may present a performance issue; we
+ need to monitor this.
+- When files are saved to ownCloud via WebDAV, a .part file extension is used so
+ that the file isn't cached before the upload has been completed. .part files
+ are not compatible with files_encrytion's key management system however, so
+ we have to always sanitise such paths manually before using them.
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index 1d71ef97443918d538e8188167c94d7bbafaf753..bd73f47072b1fe4b9914ec14a7f6d47fcc8f816a 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.3
\ No newline at end of file
+0.4
diff --git a/apps/files_encryption/css/settings-personal.css b/apps/files_encryption/css/settings-personal.css
new file mode 100644
index 0000000000000000000000000000000000000000..4ee0acc9768ce52dc9262764086ecc2f66400b1d
--- /dev/null
+++ b/apps/files_encryption/css/settings-personal.css
@@ -0,0 +1,10 @@
+/* Copyright (c) 2013, Sam Tuke, <samtuke@owncloud.com>
+ This file is licensed under the Affero General Public License version 3 or later.
+ See the COPYING-README file. */
+
+#encryptAllError
+, #encryptAllSuccess
+, #recoveryEnabledError
+, #recoveryEnabledSuccess {
+ display: none;
+}
\ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2731d5a92f74ad4ed435d77a37d35cc9018cb7df..d1b08a0b9788d9261b1a01decd384f5b917d6d86 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -23,10 +23,11 @@
namespace OCA\Encryption;
+use OC\Files\Filesystem;
+
/**
* Class for hook specific logic
*/
-
class Hooks {
// TODO: use passphrase for encrypting private key that is separate to
@@ -36,156 +37,489 @@ class Hooks {
* @brief Startup encryption backend upon user login
* @note This method should never be called for users using client side encryption
*/
- public static function login( $params ) {
-
+ public static function login($params) {
+
// Manually initialise Filesystem{} singleton with correct
// fake root path, in order to avoid fatal webdav errors
- \OC\Files\Filesystem::init( $params['uid'], $params['uid'] . '/' . 'files' . '/' );
-
- $view = new \OC_FilesystemView( '/' );
-
- $util = new Util( $view, $params['uid'] );
-
- // Check files_encryption infrastructure is ready for action
- if ( ! $util->ready() ) {
-
- \OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
-
- return $util->setupServerSide( $params['password'] );
+ // NOTE: disabled because this give errors on webdav!
+ //\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
+ $view = new \OC_FilesystemView('/');
+
+ // ensure filesystem is loaded
+ if(!\OC\Files\Filesystem::$loaded) {
+ \OC_Util::setupFS($params['uid']);
}
-
- \OC_FileProxy::$enabled = false;
-
- $encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
-
- \OC_FileProxy::$enabled = true;
-
- $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
-
- $session = new Session();
-
- $session->setPrivateKey( $privateKey, $params['uid'] );
-
- $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
-
- // Set legacy encryption key if it exists, to support
- // depreciated encryption system
- if (
- $view1->file_exists( 'encryption.key' )
- && $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
- ) {
-
- $plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
-
- $session->setLegacyKey( $plainLegacyKey );
-
+
+ $util = new Util($view, $params['uid']);
+
+ // setup user, if user not ready force relogin
+ if (Helper::setupUser($util, $params['password']) === false) {
+ return false;
}
-
- $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
-
- // Encrypt existing user files:
- // This serves to upgrade old versions of the encryption
- // app (see appinfo/spec.txt)
- if (
- $util->encryptAll( $publicKey, '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
- ) {
-
- \OC_Log::write(
- 'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" started at login'
- , \OC_Log::INFO
- );
-
+
+ $encryptedKey = Keymanager::getPrivateKey($view, $params['uid']);
+
+ $privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $params['password']);
+
+ $session = new \OCA\Encryption\Session($view);
+
+ $session->setPrivateKey($privateKey, $params['uid']);
+
+ // Check if first-run file migration has already been performed
+ $migrationCompleted = $util->getMigrationStatus();
+
+ // If migration not yet done
+ if (!$migrationCompleted) {
+
+ $userView = new \OC_FilesystemView('/' . $params['uid']);
+
+ // Set legacy encryption key if it exists, to support
+ // depreciated encryption system
+ if (
+ $userView->file_exists('encryption.key')
+ && $encLegacyKey = $userView->file_get_contents('encryption.key')
+ ) {
+
+ $plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);
+
+ $session->setLegacyKey($plainLegacyKey);
+
+ }
+
+ // Encrypt existing user files:
+ // This serves to upgrade old versions of the encryption
+ // app (see appinfo/spec.txt)
+ if (
+ $util->encryptAll('/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'])
+ ) {
+
+ \OC_Log::write(
+ 'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" completed'
+ , \OC_Log::INFO
+ );
+
+ }
+
+ // Register successful migration in DB
+ $util->setMigrationStatus(1);
+
}
return true;
}
-
+
+ /**
+ * @brief setup encryption backend upon user created
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function postCreateUser($params) {
+ $view = new \OC_FilesystemView('/');
+
+ $util = new Util($view, $params['uid']);
+
+ Helper::setupUser($util, $params['password']);
+ }
+
+ /**
+ * @brief cleanup encryption backend upon user deleted
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function postDeleteUser($params) {
+ $view = new \OC_FilesystemView('/');
+
+ // cleanup public key
+ $publicKey = '/public-keys/' . $params['uid'] . '.public.key';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view->unlink($publicKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
/**
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
- public static function setPassphrase( $params ) {
-
+ public static function setPassphrase($params) {
+
// Only attempt to change passphrase if server-side encryption
// is in use (client-side encryption does not have access to
// the necessary keys)
- if ( Crypt::mode() == 'server' ) {
-
- $session = new Session();
-
- // Get existing decrypted private key
- $privateKey = $session->getPrivateKey();
-
- // Encrypt private key with new user pwd as passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
-
- // Save private key
- Keymanager::setPrivateKey( $encryptedPrivateKey );
-
- // NOTE: Session does not need to be updated as the
- // private key has not changed, only the passphrase
- // used to decrypt it has changed
-
+ if (Crypt::mode() === 'server') {
+
+ if ($params['uid'] === \OCP\User::getUser()) {
+
+ $view = new \OC_FilesystemView('/');
+
+ $session = new \OCA\Encryption\Session($view);
+
+ // Get existing decrypted private key
+ $privateKey = $session->getPrivateKey();
+
+ // Encrypt private key with new user pwd as passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($privateKey, $params['password']);
+
+ // Save private key
+ Keymanager::setPrivateKey($encryptedPrivateKey);
+
+ // NOTE: Session does not need to be updated as the
+ // private key has not changed, only the passphrase
+ // used to decrypt it has changed
+
+
+ } else { // admin changed the password for a different user, create new keys and reencrypt file keys
+
+ $user = $params['uid'];
+ $recoveryPassword = $params['recoveryPassword'];
+ $newUserPassword = $params['password'];
+
+ $view = new \OC_FilesystemView('/');
+
+ // make sure that the users home is mounted
+ \OC\Files\Filesystem::initMountPoints($user);
+
+ $keypair = Crypt::createKeypair();
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+ $view->file_put_contents('/public-keys/' . $user . '.public.key', $keypair['publicKey']);
+
+ // Encrypt private key empty passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword);
+
+ // Save private key
+ $view->file_put_contents(
+ '/' . $user . '/files_encryption/' . $user . '.private.key', $encryptedPrivateKey);
+
+ if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
+ $util = new Util($view, $user);
+ $util->recoverUsersFiles($recoveryPassword);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
-
}
-
+
+ /*
+ * @brief check if files can be encrypted to every user.
+ */
/**
- * @brief update the encryption key of the file uploaded by the client
+ * @param $params
*/
- public static function updateKeyfile( $params ) {
-
- if ( Crypt::mode() == 'client' ) {
-
- if ( isset( $params['properties']['key'] ) ) {
-
- $view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
-
- Keymanager::setFileKey( $view, $params['path'], $userId, $params['properties']['key'] );
-
- } else {
-
- \OC_Log::write(
- 'Encryption library', "Client side encryption is enabled but the client doesn't provide a encryption key for the file!"
- , \OC_Log::ERROR
- );
-
- error_log( "Client side encryption is enabled but the client doesn't provide an encryption key for the file!" );
-
+ public static function preShared($params) {
+
+ $users = array();
+ $view = new \OC\Files\View('/public-keys/');
+
+ switch ($params['shareType']) {
+ case \OCP\Share::SHARE_TYPE_USER:
+ $users[] = $params['shareWith'];
+ break;
+ case \OCP\Share::SHARE_TYPE_GROUP:
+ $users = \OC_Group::usersInGroup($params['shareWith']);
+ break;
+ }
+
+ $error = false;
+ foreach ($users as $user) {
+ if (!$view->file_exists($user . '.public.key')) {
+ $error = true;
+ break;
}
-
}
-
+
+ if ($error) // Set flag var 'run' to notify emitting
+ // script that hook execution failed
+ {
+ $params['run']->run = false;
+ }
+ // TODO: Make sure files_sharing provides user
+ // feedback on failed share
}
-
+
/**
- * @brief
+ * @brief
*/
- public static function postShared( $params ) {
+ public static function postShared($params) {
+
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // itemSource -> int, filecache file ID
+ // [parent] =>
+ // [itemTarget] => /13
+ // shareWith -> string, uid of user being shared to
+ // fileTarget -> path of file being shared
+ // uidOwner -> owner of the original file being shared
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [uidOwner] => admin
+ // [permissions] => 17
+ // [fileSource] => 13
+ // [fileTarget] => /test8
+ // [id] => 10
+ // [token] =>
+ // [run] => whether emitting script should continue to run
+ // TODO: Should other kinds of item be encrypted too?
+
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $view = new \OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $path = $util->fileIdToPath($params['itemSource']);
+
+ $share = $util->getParentFromShare($params['id']);
+ //if parent is set, then this is a re-share action
+ if ($share['parent'] !== null) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent($params['parent']);
+
+ // if parent is file the it is an 1:1 share
+ if ($parent['item_type'] === 'file') {
+
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'];
+ } else {
+
+ // NOTE: parent is folder but shared was a file!
+ // we try to rebuild the missing path
+ // some examples we face here
+ // user1 share folder1 with user2 folder1 has
+ // the following structure
+ // /folder1/subfolder1/subsubfolder1/somefile.txt
+ // user2 re-share subfolder2 with user3
+ // user3 re-share somefile.txt user4
+ // so our path should be
+ // /Shared/subfolder1/subsubfolder1/somefile.txt
+ // while user3 is sharing
+
+ if ($params['itemType'] === 'file') {
+ // get target path
+ $targetPath = $util->fileIdToPath($params['fileSource']);
+ $targetPathSplit = array_reverse(explode('/', $targetPath));
+
+ // init values
+ $path = '';
+ $sharedPart = ltrim($parent['file_target'], '/');
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+ if ($pathPart !== $sharedPart) {
+ $path = '/' . $pathPart . $path;
+ } else {
+ break;
+ }
+ }
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $path;
+ } else {
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $params['fileTarget'];
+ }
+ }
+ }
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get the path including mount point only if not a shared folder
+ if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {
+ // get path including the the storage mount point
+ $path = $util->getPathWithMountPoint($params['itemSource']);
+ }
+
+ // if a folder was shared, get a list of all (sub-)folders
+ if ($params['itemType'] === 'folder') {
+ $allFiles = $util->getAllFiles($path);
+ } else {
+ $allFiles = array($path);
+ }
+
+ foreach ($allFiles as $path) {
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
+ $util->setSharedFileKeyfiles($session, $usersSharing, $path);
+ }
+ }
}
-
+
/**
- * @brief
+ * @brief
*/
- public static function preUnshare( $params ) {
-
- // Delete existing catfile
-
- // Generate new catfile and env keys
-
- // Save env keys to user folders
+ public static function postUnshare($params) {
+
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // [itemSource] => 13
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [itemParent] =>
+
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $view = new \OC_FilesystemView('/');
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $path = $util->fileIdToPath($params['itemSource']);
+
+ // check if this is a re-share
+ if ($params['itemParent']) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent($params['itemParent']);
+
+ // get target path
+ $targetPath = $util->fileIdToPath($params['itemSource']);
+ $targetPathSplit = array_reverse(explode('/', $targetPath));
+
+ // init values
+ $path = '';
+ $sharedPart = ltrim($parent['file_target'], '/');
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+ if ($pathPart !== $sharedPart) {
+ $path = '/' . $pathPart . $path;
+ } else {
+ break;
+ }
+ }
+
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $path;
+ }
+
+ // for group shares get a list of the group members
+ if ($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
+ $userIds = \OC_Group::usersInGroup($params['shareWith']);
+ } else {
+ if ($params['shareType'] === \OCP\Share::SHARE_TYPE_LINK) {
+ $userIds = array($util->getPublicShareKeyId());
+ } else {
+ $userIds = array($params['shareWith']);
+ }
+ }
+
+ // get the path including mount point only if not a shared folder
+ if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {
+ // get path including the the storage mount point
+ $path = $util->getPathWithMountPoint($params['itemSource']);
+ }
+
+ // if we unshare a folder we need a list of all (sub-)files
+ if ($params['itemType'] === 'folder') {
+ $allFiles = $util->getAllFiles( $path );
+ } else {
+ $allFiles = array($path);
+ }
+
+ foreach ($allFiles as $path) {
+
+ // check if the user still has access to the file, otherwise delete share key
+ $sharingUsers = $util->getSharingUsersArray(true, $path);
+
+ // Unshare every user who no longer has access to the file
+ $delUsers = array_diff($userIds, $sharingUsers);
+
+ // delete share key
+ Keymanager::delShareKey($view, $delUsers, $path);
+ }
+
+ }
}
-
+
/**
- * @brief
+ * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
+ * @param array with oldpath and newpath
+ *
+ * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+ * of the stored versions along the actual file
*/
- public static function preUnshareAll( $params ) {
-
- trigger_error( "preUnshareAll" );
-
+ public static function postRename($params) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+
+ // Format paths to be relative to user files dir
+ $oldKeyfilePath = \OC\Files\Filesystem::normalizePath(
+ $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
+ $newKeyfilePath = \OC\Files\Filesystem::normalizePath(
+ $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
+
+ // add key ext if this is not an folder
+ if (!$view->is_dir($oldKeyfilePath)) {
+ $oldKeyfilePath .= '.key';
+ $newKeyfilePath .= '.key';
+
+ // handle share-keys
+ $localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $params['oldpath']);
+ $matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+ foreach ($matches as $src) {
+ $dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));
+
+ // create destination folder if not exists
+ if (!file_exists(dirname($dst))) {
+ mkdir(dirname($dst), 0750, true);
+ }
+
+ rename($src, $dst);
+ }
+
+ } else {
+ // handle share-keys folders
+ $oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
+ $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
+ $newShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
+ $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
+
+ // create destination folder if not exists
+ if (!$view->file_exists(dirname($newShareKeyfilePath))) {
+ $view->mkdir(dirname($newShareKeyfilePath), 0750, true);
+ }
+
+ $view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
+ }
+
+ // Rename keyfile so it isn't orphaned
+ if ($view->file_exists($oldKeyfilePath)) {
+
+ // create destination folder if not exists
+ if (!$view->file_exists(dirname($newKeyfilePath))) {
+ $view->mkdir(dirname($newKeyfilePath), 0750, true);
+ }
+
+ $view->rename($oldKeyfilePath, $newKeyfilePath);
+ }
+
+ // build the path to the file
+ $newPath = '/' . $userId . '/files' . $params['newpath'];
+ $newPathRelative = $params['newpath'];
+
+ if ($util->fixFileSize($newPath)) {
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
}
-
}
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c1866445eee9133cf090a0a0bc0757d6e33aa22
--- /dev/null
+++ b/apps/files_encryption/js/settings-admin.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>, Robin Appelman
+ * <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+OC.msg={
+ startSaving:function(selector){
+ $(selector)
+ .html( t('settings', 'Saving...') )
+ .removeClass('success')
+ .removeClass('error')
+ .stop(true, true)
+ .show();
+ },
+ finishedSaving:function(selector, data){
+ if( data.status === "success" ){
+ $(selector).html( data.data.message )
+ .addClass('success')
+ .stop(true, true)
+ .delay(3000)
+ .fadeOut(900);
+ }else{
+ $(selector).html( data.data.message ).addClass('error');
+ }
+ }
+};
+
+$(document).ready(function(){
+ // Trigger ajax on recoveryAdmin status change
+ var enabledStatus = $('#adminEnableRecovery').val();
+
+ $('input:password[name="recoveryPassword"]').keyup(function(event) {
+ var recoveryPassword = $( '#recoveryPassword' ).val();
+ var checkedButton = $('input:radio[name="adminEnableRecovery"]:checked').val();
+ var uncheckedValue = (1+parseInt(checkedButton)) % 2;
+ if (recoveryPassword != '' ) {
+ $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').removeAttr("disabled");
+ } else {
+ $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').attr("disabled", "true");
+ }
+ });
+
+ $( 'input:radio[name="adminEnableRecovery"]' ).change(
+ function() {
+ var recoveryStatus = $( this ).val();
+ var oldStatus = (1+parseInt(recoveryStatus)) % 2;
+ var recoveryPassword = $( '#recoveryPassword' ).val();
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
+ , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
+ , function( result ) {
+ if (result.status === "error") {
+ OC.Notification.show(t('admin', result.data.message));
+ $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
+ } else {
+ OC.Notification.hide();
+ if (recoveryStatus === "0") {
+ $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+ $('input:password[name="changeRecoveryPassword"]').attr("disabled", "true");
+ $('input:password[name="changeRecoveryPassword"]').val("");
+ } else {
+ $('input:password[name="changeRecoveryPassword"]').removeAttr("disabled");
+ }
+ }
+ }
+ );
+ }
+ );
+
+ // change recovery password
+
+ $('input:password[name="changeRecoveryPassword"]').keyup(function(event) {
+ var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+ var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+ if (newRecoveryPassword != '' && oldRecoveryPassword != '' ) {
+ $('button:button[name="submitChangeRecoveryKey"]').removeAttr("disabled");
+ } else {
+ $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+ }
+ });
+
+
+ $('button:button[name="submitChangeRecoveryKey"]').click(function() {
+ var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+ var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+ OC.msg.startSaving('#encryption .msg');
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'changeRecoveryPassword.php' )
+ , { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword }
+ , function( data ) {
+ if (data.status == "error") {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ } else {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ }
+ }
+ );
+ });
+
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
new file mode 100644
index 0000000000000000000000000000000000000000..312b672ad464be90d5b3ef5cd466c5677141baa2
--- /dev/null
+++ b/apps/files_encryption/js/settings-personal.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+$(document).ready(function(){
+ // Trigger ajax on recoveryAdmin status change
+ $( 'input:radio[name="userEnableRecovery"]' ).change(
+ function() {
+
+ // Hide feedback messages in case they're already visible
+ $('#recoveryEnabledSuccess').hide();
+ $('#recoveryEnabledError').hide();
+
+ var recoveryStatus = $( this ).val();
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'userrecovery.php' )
+ , { userEnableRecovery: recoveryStatus }
+ , function( data ) {
+ if ( data.status == "success" ) {
+ $('#recoveryEnabledSuccess').show();
+ } else {
+ $('#recoveryEnabledError').show();
+ }
+ }
+ );
+ // Ensure page is not reloaded on form submit
+ return false;
+ }
+ );
+
+ $("#encryptAll").click(
+ function(){
+
+ // Hide feedback messages in case they're already visible
+ $('#encryptAllSuccess').hide();
+ $('#encryptAllError').hide();
+
+ var userPassword = $( '#userPassword' ).val();
+ var encryptAll = $( '#encryptAll' ).val();
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'encryptall.php' )
+ , { encryptAll: encryptAll, userPassword: userPassword }
+ , function( data ) {
+ if ( data.status == "success" ) {
+ $('#encryptAllSuccess').show();
+ } else {
+ $('#encryptAllError').show();
+ }
+ }
+ );
+ // Ensure page is not reloaded on form submit
+ return false;
+ }
+
+ );
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
deleted file mode 100644
index 0be857bb73e9dd6d35a7ad30e702d3a5c25a08a6..0000000000000000000000000000000000000000
--- a/apps/files_encryption/js/settings.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-
-$(document).ready(function(){
- $('#encryption_blacklist').multiSelect({
- oncheck:blackListChange,
- onuncheck:blackListChange,
- createText:'...'
- });
-
- function blackListChange(){
- var blackList=$('#encryption_blacklist').val().join(',');
- OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
- }
-})
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index c8a475afd67e29cbb2392e212433572fea889101..1adc158c6b8d0bf36286c999883d76b1736ec7cb 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "التشفير",
-"File encryption is enabled." => "تشفير الملفات فعال.",
-"The following file types will not be encrypted:" => "الملفات الاتية لن يتم تشفيرها:",
-"Exclude the following file types from encryption:" => "إستثناء أنواع الملفات الاتية من التشفير: ",
-"None" => "لا شيء"
+"Saving..." => "جاري الحفظ...",
+"Encryption" => "التشفير"
);
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 07a97f5f8a6d6a2b698297b08e5022e163b5f367..f21f7641c1a58ce1a1994dff92f7a399f60ff0e2 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Криптиране",
-"None" => "Няма"
+"Saving..." => "Записване...",
+"Encryption" => "Криптиране"
);
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 43767d565180797d311a9b0b2400d8b00f1abfb3..068de46e7a18d45c52e24a5d98fc69e1b703629c 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "সংকেতায়ন",
-"None" => "কোনটিই নয়"
+"Saving..." => "সংরক্ষণ করা হচ্ছে..",
+"Encryption" => "সংকেতায়ন"
);
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 2d59a306d33bfcdd090f16dcac2eae1a6858dd5d..46e91d1f0709f5e7ae5a0577f4402c6daf9b971c 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Xifrat",
-"File encryption is enabled." => "El xifrat de fitxers està activat.",
-"The following file types will not be encrypted:" => "Els tipus de fitxers següents no es xifraran:",
-"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents del xifratge:",
-"None" => "Cap"
+"Saving..." => "Desant...",
+"Encryption" => "Xifrat"
);
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index d225688a079d78356a3ec1ae5eb3ef9cf4041306..f9b2dd06b6f2b989bded468b7c5b4d99dcae27c4 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Šifrování",
-"File encryption is enabled." => "Šifrování je povoleno.",
-"The following file types will not be encrypted:" => "Následující typy souborů nebudou šifrovány:",
-"Exclude the following file types from encryption:" => "Vyjmout následující typy souborů ze šifrování:",
-"None" => "Žádné"
+"Saving..." => "Ukládám...",
+"Encryption" => "Šifrování"
);
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
index 523b5dd73dff8cd97306b67eaaf33632eeb85531..6e18a7913c84afb6d279d58be1766c1e1d79e8c8 100644
--- a/apps/files_encryption/l10n/cy_GB.php
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Amgryptiad",
-"File encryption is enabled." => "Galluogwyd amgryptio ffeiliau.",
-"The following file types will not be encrypted:" => "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:",
-"Exclude the following file types from encryption:" => "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:",
-"None" => "Dim"
+"Saving..." => "Yn cadw...",
+"Encryption" => "Amgryptiad"
);
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index b085381ea7b2b72f8fb66a9844c771ec9739733a..1cd43390aa3c289413c65f9e2390be265c0338dc 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Fil kryptering aktiveret.",
-"The following file types will not be encrypted:" => "De følgende filtyper vil ikke blive krypteret:",
-"Exclude the following file types from encryption:" => "Ekskluder de følgende fil typer fra kryptering:",
-"None" => "Ingen"
+"Saving..." => "Gemmer...",
+"Encryption" => "Kryptering"
);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index bcf0ca5ad63917d3a73fee9de9bc7e927d4fa8fe..2ab77f480cfd4fa3687748e3ae07b7c3973766a3 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Verschlüsselung",
-"File encryption is enabled." => "Dateiverschlüsselung ist aktiviert",
-"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
-"Exclude the following file types from encryption:" => "Schließe die folgenden Dateitypen von der Verschlüsselung aus:",
-"None" => "Nichts"
+"Saving..." => "Speichern...",
+"Encryption" => "Verschlüsselung"
);
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 71fd7d96711d06e12a79c4273ca08f394761a594..884ed3c50b03d0439e5b752049b32eff721c5bed 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,7 +1,19 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
+"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Saving..." => "Speichern...",
"Encryption" => "Verschlüsselung",
-"File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
-"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
-"Exclude the following file types from encryption:" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:",
-"None" => "Nichts"
+"Recovery account password" => "Account-Passwort wiederherstellen",
+"Enabled" => "Aktiviert",
+"Disabled" => "Deaktiviert",
+"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung",
+"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung",
+"Change Password" => "Passwort ändern",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
+"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
);
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 82a4c92ec2856e27a7aff4f9b1c1db7cbdb7f8cb..7067799cd2e1afea357adf31f6ba1d9c559e4343 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Κρυπτογράφηση",
-"File encryption is enabled." => "Η κρυπτογράφηση αρχείων είναι ενεργή.",
-"The following file types will not be encrypted:" => "Οι παρακάτω τύποι αρχείων δεν θα κρυπτογραφηθούν:",
-"Exclude the following file types from encryption:" => "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση:",
-"None" => "Τίποτα"
+"Saving..." => "Γίνεται αποθήκευση...",
+"Encryption" => "Κρυπτογράφηση"
);
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 50847062c3ba08f0923d447883ca5c83ba2515bd..ea405fda1ab7e1e219f53183c3d34977714f7b62 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Ĉifrado",
-"None" => "Nenio"
+"Saving..." => "Konservante...",
+"Encryption" => "Ĉifrado"
);
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 4ea87b92e7c490b58b390070529ca0818bb4a367..58adbd716a839eedd84becaeac32ecdf4a3e4ab7 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
+"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+"Password successfully changed." => "Su contraseña ha sido cambiada",
+"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+"Saving..." => "Guardando...",
"Encryption" => "Cifrado",
-"File encryption is enabled." => "La encriptacion de archivo esta activada.",
-"The following file types will not be encrypted:" => "Los siguientes tipos de archivo no seran encriptados:",
-"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivo de la encriptacion:",
-"None" => "Ninguno"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
+"Recovery account password" => "Recuperar contraseña",
+"Enabled" => "Habilitar",
+"Disabled" => "Deshabilitado",
+"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:",
+"Old Recovery account password" => "Contraseña de recuperación actual",
+"New Recovery account password" => "Contraseña de recuperación nueva",
+"Change Password" => "Cambiar contraseña",
+"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su contraseña",
+"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
+"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
);
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index af522879e16f7d4559413c22cef8ac754ffc1b4e..857186a55fa219bbe69dcd5c9e33019e26f43326 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Encriptación",
-"File encryption is enabled." => "La encriptación de archivos no está habilitada",
-"The following file types will not be encrypted:" => "Los siguientes tipos de archivos no serán encriptados",
-"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivos de encriptación:",
-"None" => "Ninguno"
+"Saving..." => "Guardando...",
+"Encryption" => "Encriptación"
);
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0d189ac062ea4cbf9b42654edcd88867e38f3846..e762647f782f6d1ebec868c393af9c6f13b178c3 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
+"Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
+"Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+"Password successfully changed." => "Parool edukalt vahetatud.",
+"Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+"Saving..." => "Salvestamine...",
"Encryption" => "Krüpteerimine",
-"File encryption is enabled." => "Faili krüpteerimine on sisse lülitatud.",
-"The following file types will not be encrypted:" => "Järgnevaid failitüüpe ei krüpteerita:",
-"Exclude the following file types from encryption:" => "Järgnevaid failitüüpe ei krüpteerita:",
-"None" => "Pole"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
+"Recovery account password" => "Konto taasteparool",
+"Enabled" => "Sisse lülitatud",
+"Disabled" => "Väljalülitatud",
+"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
+"Old Recovery account password" => "Konto vana taaste parool",
+"New Recovery account password" => "Konto uus taasteparool",
+"Change Password" => "Muuda parooli",
+"Enable password recovery by sharing all files with your administrator:" => "Luba parooli taaste jagades kõik failid administraatoriga:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parool on kadunud",
+"File recovery settings updated" => "Faili taaste seaded uuendatud",
+"Could not update file recovery" => "Ei suuda uuendada taastefaili"
);
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 7e3b7611ff2e49f85bbdf0501623bdc70acf750a..253953e5c52fa215457afe828ac6147825412dea 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Enkriptazioa",
-"File encryption is enabled." => "Fitxategien enkriptazioa gaituta dago.",
-"The following file types will not be encrypted:" => "Hurrengo fitxategi motak ez dira enkriptatuko:",
-"Exclude the following file types from encryption:" => "Baztertu hurrengo fitxategi motak enkriptatzetik:",
-"None" => "Ezer"
+"Saving..." => "Gordetzen...",
+"Encryption" => "Enkriptazioa"
);
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 7acf196b791aade55985c5ec52201a482402fe1e..af2e36b2a83d9c09778dfb538d7215f1e5898512 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "رمزگذاری",
-"File encryption is enabled." => "رمزنگاری فایلها فعال شد.",
-"The following file types will not be encrypted:" => "فایلهای زیر رمزنگاری نخواهند شد:",
-"Exclude the following file types from encryption:" => "فایلهای زیر از رمزنگاری نادیده گرفته می شوند:",
-"None" => "هیچکدام"
+"Saving..." => "در حال ذخیره سازی...",
+"Encryption" => "رمزگذاری"
);
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 6352d396b3c1ae65fecc57a1ba2a689aace7863b..a00cc8ab96e09e3339f2326dc9a81e55b1501516 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,7 +1,9 @@
<?php $TRANSLATIONS = array(
+"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
+"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+"Saving..." => "Tallennetaan...",
"Encryption" => "Salaus",
-"File encryption is enabled." => "Tiedostojen salaus on käytössä.",
-"The following file types will not be encrypted:" => "Seuraavia tiedostotyyppejä ei salata:",
-"Exclude the following file types from encryption:" => "Älä salaa seuravia tiedostotyyppejä:",
-"None" => "Ei mitään"
+"Enabled" => "Käytössä",
+"Disabled" => "Ei käytössä",
+"Change Password" => "Vaihda salasana"
);
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 88f1e4a393f24ad432ca05cd3e8a17dbd497ef61..98fb70691df3da3547ef4167e452c076010b4901 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Chiffrement",
-"File encryption is enabled." => "Le chiffrement des fichiers est activé",
-"The following file types will not be encrypted:" => "Les fichiers de types suivants ne seront pas chiffrés :",
-"Exclude the following file types from encryption:" => "Ne pas chiffrer les fichiers dont les types sont les suivants :",
-"None" => "Aucun"
+"Saving..." => "Enregistrement...",
+"Encryption" => "Chiffrement"
);
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 3210f71545312e5b90b9677f90ecacd861e4d157..ca93efba9aa20d76af5003a99812f6c559dc1de5 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
+"Could not enable recovery key. Please check your recovery key password!" => "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
+"Could not disable recovery key. Please check your recovery key password!" => "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+"Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
+"Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
+"Saving..." => "Gardando...",
"Encryption" => "Cifrado",
-"File encryption is enabled." => "O cifrado de ficheiros está activado",
-"The following file types will not be encrypted:" => "Os seguintes tipos de ficheiros non van seren cifrados:",
-"Exclude the following file types from encryption:" => "Excluír os seguintes tipos de ficheiros do cifrado:",
-"None" => "Ningún"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
+"Recovery account password" => "Recuperación do contrasinal da conta",
+"Enabled" => "Activado",
+"Disabled" => "Desactivado",
+"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
+"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
+"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change Password" => "Cambiar o contrasinal",
+"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal",
+"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
+"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
);
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index cbb74bfee9a5cb5b7895a46bfac1cff99d58758f..7a80cfa2f9f07af3dca60f85539559762b72a093 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "הצפנה",
-"None" => "כלום"
+"Saving..." => "שמירה…",
+"Encryption" => "הצפנה"
);
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b9284ddc5eaec498397034f55e74681f620a241
--- /dev/null
+++ b/apps/files_encryption/l10n/hr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Spremanje..."
+);
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 4043da108c0e0a991d2d1385f63eedb172779035..bf95c31f2c5fa61a459b58b0b882d23465c068ce 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Titkosítás",
-"File encryption is enabled." => "Az állományok titkosítása be van kapcsolva.",
-"The following file types will not be encrypted:" => "A következő fájltípusok nem kerülnek titkosításra:",
-"Exclude the following file types from encryption:" => "Zárjuk ki a titkosításból a következő fájltípusokat:",
-"None" => "Egyik sem"
+"Saving..." => "Mentés...",
+"Encryption" => "Titkosítás"
);
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 6044348e72e335b5f813e25382185af6bfd9927f..ad827b537910c58755d2825e024f9286604ee946 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Enkripsi",
-"File encryption is enabled." => "Enkripsi berkas aktif.",
-"The following file types will not be encrypted:" => "Tipe berkas berikut tidak akan dienkripsi:",
-"Exclude the following file types from encryption:" => "Kecualikan tipe berkas berikut dari enkripsi:",
-"None" => "Tidak ada"
+"Saving..." => "Menyimpan...",
+"Encryption" => "Enkripsi"
);
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index bd964185c4575bf57662d2a5536bcb0df8a84648..0f98c6bd3bff6c7c602358919e478ab2b6c1487a 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Dulkóðun",
-"None" => "Ekkert"
+"Saving..." => "Er að vista ...",
+"Encryption" => "Dulkóðun"
);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index c71713452695ab9048e9c8e608c243a6d81cee04..63ae4b70b443aa145b243f3761bea1e54271ecd7 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Chiave di ripristino abilitata correttamente",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
+"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
+"Could not disable recovery key. Please check your recovery key password!" => "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
+"Password successfully changed." => "Password modificata correttamente.",
+"Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
+"Saving..." => "Salvataggio in corso...",
"Encryption" => "Cifratura",
-"File encryption is enabled." => "La cifratura dei file è abilitata.",
-"The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
-"Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
-"None" => "Nessuno"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
+"Recovery account password" => "Password di ripristino dell'account",
+"Enabled" => "Abilitata",
+"Disabled" => "Disabilitata",
+"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
+"Old Recovery account password" => "Vecchia password di ripristino dell'account",
+"New Recovery account password" => "Nuova password di ripristino dell'account",
+"Change Password" => "Modifica password",
+"Enable password recovery by sharing all files with your administrator:" => "Abilita il ripristino della password condividendo tutti i file con l'amministratore:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "L'abilitazione di questa opzione ti consentirà di ottenere nuovamente accesso ai tuoi file cifrati in caso di smarrimento della password",
+"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
+"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
);
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 35fba615aec29d6c6974cfd4b369655142e7be79..6d2d3e249c0b0ffc17b4e4783c41ac279a135244 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "リカバリ用のキーは正常に有効化されました",
+"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい！",
+"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
+"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！",
+"Password successfully changed." => "パスワードを変更できました。",
+"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+"Saving..." => "保存中...",
"Encryption" => "暗号化",
-"File encryption is enabled." => "ファイルの暗号化は有効です。",
-"The following file types will not be encrypted:" => "次のファイルタイプは暗号化されません:",
-"Exclude the following file types from encryption:" => "次のファイルタイプを暗号化から除外:",
-"None" => "なし"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
+"Recovery account password" => "復旧アカウントのパスワード",
+"Enabled" => "有効",
+"Disabled" => "無効",
+"Change encryption passwords recovery key:" => "復旧キーの暗号化パスワードを変更:",
+"Old Recovery account password" => "古い復旧アカウントのパスワード",
+"New Recovery account password" => "新しい復旧アカウントのパスワード",
+"Change Password" => "パスワードを変更",
+"Enable password recovery by sharing all files with your administrator:" => "管理者が全ての共有ファイルに対してパスワードによる復旧を有効にする:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。",
+"File recovery settings updated" => "ファイル復旧設定が更新されました",
+"Could not update file recovery" => "ファイル復旧を更新できませんでした"
);
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index 0362c676f00896ffeec998b4d561fd6ec189d674..55a59f44341af0c3a7a1485e2779807de11deb4e 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ენკრიპცია",
-"File encryption is enabled." => "ფაილის ენკრიპცია ჩართულია.",
-"The following file types will not be encrypted:" => "შემდეგი ფაილური ტიპების ენკრიპცია არ მოხდება:",
-"Exclude the following file types from encryption:" => "ამოიღე შემდეგი ფაილის ტიპები ენკრიპციიდან:",
-"None" => "არა"
+"Saving..." => "შენახვა...",
+"Encryption" => "ენკრიპცია"
);
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index bd1580578c42146002ac808db852674b847b0c6b..cf8149da3abf724b6c02b9f0b878bd1c1195aabc 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "암호화",
-"None" => "없음"
+"Saving..." => "저장 중...",
+"Encryption" => "암호화"
);
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 02c030014fa014b23ecefbfcb783efc2cdd2a564..61b720372ec0ac322422ae32d1e7745a11404b8d 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "نهێنیکردن",
-"None" => "هیچ"
+"Saving..." => "پاشکهوتدهکات...",
+"Encryption" => "نهێنیکردن"
);
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
new file mode 100644
index 0000000000000000000000000000000000000000..77bad681732931b2d094e3a5b1bffcea7770604b
--- /dev/null
+++ b/apps/files_encryption/l10n/lb.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Speicheren..."
+);
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 67769c8f36566ab45dbaafce7057b9f7eaee18b4..6bc80ff44ab931bed0c3882af8fed16d37f2ff06 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Šifravimas",
-"None" => "Nieko"
+"Saving..." => "Saugoma...",
+"Encryption" => "Šifravimas"
);
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index fc31ccdb92d25209689358bc5e00522f3f2b1e36..04922854ceba7938a57ddd7e041f35105b7afff9 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Šifrēšana",
-"File encryption is enabled." => "Datņu šifrēšana ir aktivēta.",
-"The following file types will not be encrypted:" => "Sekojošās datnes netiks šifrētas:",
-"Exclude the following file types from encryption:" => "Sekojošos datņu tipus izslēgt no šifrēšanas:",
-"None" => "Nav"
+"Saving..." => "Saglabā...",
+"Encryption" => "Šifrēšana"
);
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index 513606fadc3dd68e5cb2f3d603278d47abef4ab1..a7216f205adbee12a97fd0b208deeed3958e956f 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Енкрипција",
-"None" => "Ништо"
+"Saving..." => "Снимам...",
+"Encryption" => "Енкрипција"
);
diff --git a/apps/files_encryption/l10n/ms_MY.php b/apps/files_encryption/l10n/ms_MY.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb963cb72d26e8c91fd52d77c707b6dfa3c8dc96
--- /dev/null
+++ b/apps/files_encryption/l10n/ms_MY.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Simpan..."
+);
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index a5e16a034218f70cfbd03f2b55073b9c46934166..d4e2b1ffb50a8ef55643cfd438e1a6d54a019804 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Fil-kryptering er aktivert.",
-"The following file types will not be encrypted:" => "Følgende filtyper vil ikke bli kryptert:",
-"Exclude the following file types from encryption:" => "Ekskluder følgende filtyper fra kryptering:",
-"None" => "Ingen"
+"Saving..." => "Lagrer...",
+"Encryption" => "Kryptering"
);
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index b1cba96aad775d5d5256796ab530cf674759651f..9c462917cf3c33374d7ad6906f88fb65ec5da34c 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
+"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
+"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
+"Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
+"Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
+"Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+"Saving..." => "Opslaan",
"Encryption" => "Versleuteling",
-"File encryption is enabled." => "Bestandsversleuteling geactiveerd.",
-"The following file types will not be encrypted:" => "De volgende bestandstypen zullen niet worden versleuteld:",
-"Exclude the following file types from encryption:" => "Sluit de volgende bestandstypen uit van versleuteling:",
-"None" => "Geen"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
+"Recovery account password" => "Herstel account wachtwoord",
+"Enabled" => "Geactiveerd",
+"Disabled" => "Gedeactiveerd",
+"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
+"Old Recovery account password" => "Oude herstel account wachtwoord",
+"New Recovery account password" => "Nieuwe herstel account wachtwoord",
+"Change Password" => "Wijzigen wachtwoord",
+"Enable password recovery by sharing all files with your administrator:" => "Activeer wachtwoordherstel door alle bestanden met uw beheerder te delen:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Door deze optie te activeren kunt u toegang tot uw versleutelde bestanden krijgen als u uw wachtwoord kwijt bent",
+"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
+"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
);
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..97b3a27a9d0b7c772d640610beae89c6b2a16ea2
--- /dev/null
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Lagrar …"
+);
diff --git a/apps/files_encryption/l10n/oc.php b/apps/files_encryption/l10n/oc.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a34c4cda12199ca891d94bb33cc6c2b34169cab
--- /dev/null
+++ b/apps/files_encryption/l10n/oc.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Enregistra..."
+);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 836f545359633a970a4dce81b8979f5eb53908ac..a6f90db4cd86ea74eaa47a3f736293747dbd8d6d 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,7 +1,18 @@
<?php $TRANSLATIONS = array(
+"Password successfully changed." => "Zmiana hasła udana.",
+"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+"Saving..." => "Zapisywanie...",
"Encryption" => "Szyfrowanie",
-"File encryption is enabled." => "Szyfrowanie plików jest włączone",
-"The following file types will not be encrypted:" => "Poniższe typy plików nie będą szyfrowane:",
-"Exclude the following file types from encryption:" => "Wyłącz poniższe typy plików z szyfrowania:",
-"None" => "Nic"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
+"Recovery account password" => "Odzyskiwanie hasła konta",
+"Enabled" => "Włączone",
+"Disabled" => "Wyłączone",
+"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
+"Old Recovery account password" => "Stare hasło odzyskiwania",
+"New Recovery account password" => "Nowe hasło odzyskiwania",
+"Change Password" => "Zmień hasło",
+"Enable password recovery by sharing all files with your administrator:" => "Włączyć hasło odzyskiwania przez udostępnianie wszystkich plików z administratorem:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
+"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
+"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
);
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index b41c6ed3153ae4afab3b292ff4bcbe3992367d75..e5fa0b55cadae5140b0771133769456affe151e3 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,7 +1,22 @@
<?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
+"Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+"Password successfully changed." => "Senha alterada com sucesso.",
+"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+"Saving..." => "Salvando...",
"Encryption" => "Criptografia",
-"File encryption is enabled." => "A criptografia de arquivos está ativada.",
-"The following file types will not be encrypted:" => "Os seguintes tipos de arquivo não serão criptografados:",
-"Exclude the following file types from encryption:" => "Excluir os seguintes tipos de arquivo da criptografia:",
-"None" => "Nada"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
+"Recovery account password" => "Recuperar a senha da conta",
+"Enabled" => "Habilidado",
+"Disabled" => "Desabilitado",
+"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
+"Old Recovery account password" => "Recuperação de senha de conta antiga",
+"New Recovery account password" => "Senha Nova da conta de Recuperação",
+"Change Password" => "Trocar Senha",
+"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida",
+"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
+"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
);
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 1c46011fc10b48b628dd03826aa913e6f5e9d9a2..e1bb17ecaa7d87c7177e5fa8e8f9edd3bf64e333 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,7 +1,9 @@
<?php $TRANSLATIONS = array(
+"Password successfully changed." => "Password alterada com sucesso.",
+"Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
+"Saving..." => "A guardar...",
"Encryption" => "Encriptação",
-"File encryption is enabled." => "A encriptação de ficheiros está ligada",
-"The following file types will not be encrypted:" => "Os seguintes ficheiros não serão encriptados:",
-"Exclude the following file types from encryption:" => "Excluir da encriptação os seguintes tipos de ficheiro:",
-"None" => "Nenhum"
+"Enabled" => "Activado",
+"Disabled" => "Desactivado",
+"Change Password" => "Mudar a Password"
);
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index a5a6fb3cb787e2440a8993be13150190e60d8888..9e04b627c42688174e7bd239a30b06d67eae872a 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Încriptare",
-"None" => "Niciuna"
+"Saving..." => "Se salvează...",
+"Encryption" => "Încriptare"
);
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index f07dec621d78e75d93f11fd30df7ac4aed1f1327..aaf7f0997c32d7832147bbd8a231c3393792f6a0 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,7 +1,18 @@
<?php $TRANSLATIONS = array(
+"Password successfully changed." => "Пароль изменен удачно.",
+"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
+"Saving..." => "Сохранение...",
"Encryption" => "Шифрование",
-"File encryption is enabled." => "Шифрование файла включено.",
-"The following file types will not be encrypted:" => "Следующие типы файлов не будут зашифрованы:",
-"Exclude the following file types from encryption:" => "Исключить следующие типы файлов из шифрованных:",
-"None" => "Нет новостей"
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
+"Recovery account password" => "Восстановление пароля учетной записи",
+"Enabled" => "Включено",
+"Disabled" => "Отключено",
+"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
+"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
+"New Recovery account password" => "Новое Восстановление пароля учетной записи",
+"Change Password" => "Изменить пароль",
+"Enable password recovery by sharing all files with your administrator:" => "Включить восстановление пароля путем доступа Вашего администратора ко всем файлам",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля",
+"File recovery settings updated" => "Настройки файла восстановления обновлены",
+"Could not update file recovery" => "Невозможно обновить файл восстановления"
);
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 7222235485c6f50a15b797ec924ef7ab27aa2645..1351f63f89b8e87ba4b736fc449e52cabed6f1f6 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Шифрование",
-"None" => "Ни один"
+"Saving..." => "Сохранение"
);
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index d9cec4b7220210880e57ccc4d4cef45f66f9082f..6c678bb3a4f93ba7dafa670e571d742969a2bc76 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ගුප්ත කේතනය",
-"None" => "කිසිවක් නැත"
+"Saving..." => "සුරැකෙමින් පවතී...",
+"Encryption" => "ගුප්ත කේතනය"
);
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index aaea9da21b4c87dad882049dbd3748efa4b6b2c1..279481fbd4f364a889e6339cdf0c13d47072687b 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,7 +1,11 @@
<?php $TRANSLATIONS = array(
+"Password successfully changed." => "Heslo úspešne zmenené.",
+"Saving..." => "Ukladám...",
"Encryption" => "Šifrovanie",
-"File encryption is enabled." => "Šifrovanie súborov nastavené.",
-"The following file types will not be encrypted:" => "Uvedené typy súborov nebudú šifrované:",
-"Exclude the following file types from encryption:" => "Nešifrovať uvedené typy súborov",
-"None" => "Žiadny"
+"Enabled" => "Povolené",
+"Disabled" => "Zakázané",
+"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
+"Change Password" => "Zmeniť heslo",
+"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
+"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
);
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 4754e21214ea5b66c4a757e59fbe23ea04fca946..a420fe161df70546ca28d4c307553d039bccca39 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Šifriranje",
-"File encryption is enabled." => "Šifriranje datotek je omogočeno.",
-"The following file types will not be encrypted:" => "Navedene vrste datotek ne bodo šifrirane:",
-"Exclude the following file types from encryption:" => "Ne šifriraj navedenih vrst datotek:",
-"None" => "Brez"
+"Saving..." => "Poteka shranjevanje ...",
+"Encryption" => "Šifriranje"
);
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index 91f7fc62a90f5f43b3275b6cf17642976ec4fd9c..a36e37c1790f1e7158feb4d1c3fcdaea563058a4 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Шифровање",
-"None" => "Ништа"
+"Saving..." => "Чување у току...",
+"Encryption" => "Шифровање"
);
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index e214a937a1d4195883b87866080a523ca50acaf1..966963b55493ef1f19259779200002767a9ecdb3 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Filkryptering är aktiverat.",
-"The following file types will not be encrypted:" => "Följande filtyper kommer inte att krypteras:",
-"Exclude the following file types from encryption:" => "Exkludera följande filtyper från kryptering:",
-"None" => "Ingen"
+"Saving..." => "Sparar...",
+"Encryption" => "Kryptering"
);
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 152e631d0fc419a43518e6c985802568a0f90b1b..63fe9ecde86944b117bd14a603506940ddd76e6a 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "மறைக்குறியீடு",
-"None" => "ஒன்றுமில்லை"
+"Saving..." => "சேமிக்கப்படுகிறது...",
+"Encryption" => "மறைக்குறியீடு"
);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 30c0324a9884b8f194f076d996e69b27436d4114..6cab4370ccf2413b2140c49bbd0fdfb4ea39edc1 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "การเข้ารหัส",
-"None" => "ไม่มี"
+"Saving..." => "กำลังบันทึกข้อมูล...",
+"Encryption" => "การเข้ารหัส"
);
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 6b42c757e6577a64371ba5d57f679eb136d17c48..917ff0a0eaebb6bc6967b67e457043f7eedd6a8b 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Şifreleme",
-"File encryption is enabled." => "Dosya şifreleme aktif.",
-"The following file types will not be encrypted:" => "Belirtilen dosya tipleri şifrelenmeyecek:",
-"Exclude the following file types from encryption:" => "Seçilen dosya tiplerini şifreleme:",
-"None" => "Hiçbiri"
+"Saving..." => "Kaydediliyor...",
+"Encryption" => "Şifreleme"
);
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index 34eeb373b3e2bf4b98576c78d1b402562f6ef9ce..954d95b4132977305ae13648d6c430b91157ac08 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "شىفىرلاش",
-"File encryption is enabled." => "ھۆججەت شىفىرلاش قوزغىتىلدى.",
-"The following file types will not be encrypted:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلانمايدۇ:",
-"Exclude the following file types from encryption:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلاشنىڭ سىرتىدا:",
-"None" => "يوق"
+"Saving..." => "ساقلاۋاتىدۇ…",
+"Encryption" => "شىفىرلاش"
);
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index d495714119163fc5709491d5491a6a2795609cbb..1c176a391423e5abf4e8d6332bd7a14b0d62c7d2 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Шифрування",
-"File encryption is enabled." => "Увімкнуто шифрування файлів.",
-"The following file types will not be encrypted:" => "Такі типи файлів шифруватись не будуть:",
-"Exclude the following file types from encryption:" => "Виключити наступні типи файлів з шифрування:",
-"None" => "Жоден"
+"Saving..." => "Зберігаю...",
+"Encryption" => "Шифрування"
);
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 40d4b1d0fec3757d7854462c60757d3a361d8635..0af5bdc9a678d886240174b835054c97c4b84d36 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Mã hóa",
-"File encryption is enabled." => "Mã hóa file đã mở",
-"The following file types will not be encrypted:" => "Loại file sau sẽ không được mã hóa",
-"Exclude the following file types from encryption:" => "Việc mã hóa không bao gồm loại file sau",
-"None" => "Không gì cả"
+"Saving..." => "Đang lưu...",
+"Encryption" => "Mã hóa"
);
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 12d903e6567169d0ca5970e91fb0d4631e54f73b..3c405a81ace8ddfb0ee74281b823a911faa19477 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "加密",
-"None" => "无"
+"Saving..." => "保存中...",
+"Encryption" => "加密"
);
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 13fa95203e437684194ed12b40637bbb00d50c6c..e565fce801c0114169f2ebde3561cbe6b9b4800a 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,7 +1,4 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "加密",
-"File encryption is enabled." => "文件加密已启用.",
-"The following file types will not be encrypted:" => "如下的文件类型将不会被加密:",
-"Exclude the following file types from encryption:" => "从加密中排除如下的文件类型:",
-"None" => "无"
+"Saving..." => "保存中",
+"Encryption" => "加密"
);
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index 0c0b709fdc1f47d88eb809638ab9a75391d08884..0a38a2ddf856ddb1e460af9821642559a44d6e5d 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,6 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "加密",
-"File encryption is enabled." => "檔案加密已開啟",
-"The following file types will not be encrypted:" => "以下文件類別將不會被加密",
-"None" => "空"
+"Encryption" => "加密"
);
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 95e61b45dc263998071b5987e32b2b7fd9e21166..faea3f54a18701df5b8476efa5c36d3908b28bbc 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,7 +1,14 @@
<?php $TRANSLATIONS = array(
+"Password successfully changed." => "成功變更密碼。",
+"Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
+"Saving..." => "儲存中...",
"Encryption" => "加密",
-"File encryption is enabled." => "檔案加密已被啟用",
-"The following file types will not be encrypted:" => "以下的文件類型不會被加密：",
-"Exclude the following file types from encryption:" => "從加密中排除的檔案類型：",
-"None" => "無"
+"Enabled" => "已啓用",
+"Disabled" => "已停用",
+"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
+"Change Password" => "變更密碼",
+"Enable password recovery by sharing all files with your administrator:" => "與管理員分享所有檔案以啓用密碼還原功能：",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案",
+"File recovery settings updated" => "檔案還原設定已更新",
+"Could not update file recovery" => "無法更新檔案還原設定"
);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 437a18669e5f2e8d67bb46a9b01752b0873f896b..ddeb3590f6032c1e5822f46291f8e5e8cc247171 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,13 +25,8 @@
namespace OCA\Encryption;
-require_once 'Crypt_Blowfish/Blowfish.php';
-
-// Todo:
-// - Add a setting "Don´t encrypt files larger than xx because of performance"
-// - Don't use a password directly as encryption key. but a key which is
-// stored on the server and encrypted with the user password. -> change pass
-// faster
+//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
/**
* Class for common cryptography functionality
@@ -41,10 +36,10 @@ class Crypt {
/**
* @brief return encryption mode client or server side encryption
- * @param string user name (use system wide setting if name=null)
+ * @param string $user name (use system wide setting if name=null)
* @return string 'client' or 'server'
*/
- public static function mode( $user = null ) {
+ public static function mode($user = null) {
return 'server';
@@ -56,30 +51,33 @@ class Crypt {
*/
public static function createKeypair() {
- $res = openssl_pkey_new();
+ $res = openssl_pkey_new(array('private_key_bits' => 4096));
// Get private key
- openssl_pkey_export( $res, $privateKey );
+ openssl_pkey_export($res, $privateKey);
// Get public key
- $publicKey = openssl_pkey_get_details( $res );
+ $publicKey = openssl_pkey_get_details($res);
$publicKey = $publicKey['key'];
- return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
+ return (array(
+ 'publicKey' => $publicKey,
+ 'privateKey' => $privateKey
+ ));
}
/**
* @brief Add arbitrary padding to encrypted data
* @param string $data data to be padded
- * @return padded data
+ * @return string padded data
* @note In order to end up with data exactly 8192 bytes long we must
* add two letters. It is impossible to achieve exactly 8192 length
* blocks with encryption alone, hence padding is added to achieve the
* required length.
*/
- public static function addPadding( $data ) {
+ public static function addPadding($data) {
$padded = $data . 'xx';
@@ -90,13 +88,13 @@ class Crypt {
/**
* @brief Remove arbitrary padding to encrypted data
* @param string $padded padded data to remove padding from
- * @return unpadded data on success, false on error
+ * @return string unpadded data on success, false on error
*/
- public static function removePadding( $padded ) {
+ public static function removePadding($padded) {
- if ( substr( $padded, -2 ) == 'xx' ) {
+ if (substr($padded, -2) === 'xx') {
- $data = substr( $padded, 0, -2 );
+ $data = substr($padded, 0, -2);
return $data;
@@ -111,29 +109,30 @@ class Crypt {
/**
* @brief Check if a file's contents contains an IV and is symmetrically encrypted
- * @return true / false
+ * @param $content
+ * @return boolean
* @note see also OCA\Encryption\Util->isEncryptedPath()
*/
- public static function isCatfile( $content ) {
+ public static function isCatfileContent($content) {
- if ( !$content ) {
+ if (!$content) {
return false;
}
- $noPadding = self::removePadding( $content );
+ $noPadding = self::removePadding($content);
// Fetch encryption metadata from end of file
- $meta = substr( $noPadding, -22 );
+ $meta = substr($noPadding, -22);
// Fetch IV from end of file
- $iv = substr( $meta, -16 );
+ $iv = substr($meta, -16);
// Fetch identifier from start of metadata
- $identifier = substr( $meta, 0, 6 );
+ $identifier = substr($meta, 0, 6);
- if ( $identifier == '00iv00') {
+ if ($identifier === '00iv00') {
return true;
@@ -150,36 +149,36 @@ class Crypt {
* @param string $path
* @return bool
*/
- public static function isEncryptedMeta( $path ) {
+ public static function isEncryptedMeta($path) {
// TODO: Use DI to get \OC\Files\Filesystem out of here
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );
+ $metadata = \OC\Files\Filesystem::getFileInfo($path);
// Return encryption status
- return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
+ return isset($metadata['encrypted']) && ( bool )$metadata['encrypted'];
}
/**
* @brief Check if a file is encrypted via legacy system
+ * @param $data
* @param string $relPath The path of the file, relative to user/data;
* e.g. filename or /Docs/filename, NOT admin/files/filename
- * @return true / false
+ * @return boolean
*/
- public static function isLegacyEncryptedContent( $data, $relPath ) {
+ public static function isLegacyEncryptedContent($data, $relPath) {
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
+ $metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');
// If a file is flagged with encryption in DB, but isn't a
// valid content + IV combination, it's probably using the
// legacy encryption system
- if (
- isset( $metadata['encrypted'] )
- and $metadata['encrypted'] === true
- and ! self::isCatfile( $data )
+ if (isset($metadata['encrypted'])
+ && $metadata['encrypted'] === true
+ && !self::isCatfileContent($data)
) {
return true;
@@ -194,17 +193,20 @@ class Crypt {
/**
* @brief Symmetrically encrypt a string
- * @returns encrypted file
+ * @param $plainContent
+ * @param $iv
+ * @param string $passphrase
+ * @return string encrypted file content
*/
- public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
+ public static function encrypt($plainContent, $iv, $passphrase = '') {
- if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+ if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $encryptedContent;
} else {
- \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );
+ \OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);
return false;
@@ -214,18 +216,21 @@ class Crypt {
/**
* @brief Symmetrically decrypt a string
- * @returns decrypted file
+ * @param $encryptedContent
+ * @param $iv
+ * @param $passphrase
+ * @throws \Exception
+ * @return string decrypted file content
*/
- public static function decrypt( $encryptedContent, $iv, $passphrase ) {
+ public static function decrypt($encryptedContent, $iv, $passphrase) {
- if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+ if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $plainContent;
-
} else {
- throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
+ throw new \Exception('Encryption library: Decryption (symmetric) of content failed');
}
@@ -237,7 +242,7 @@ class Crypt {
* @param string $iv IV to be concatenated
* @returns string concatenated content
*/
- public static function concatIv ( $content, $iv ) {
+ public static function concatIv($content, $iv) {
$combined = $content . '00iv00' . $iv;
@@ -250,20 +255,20 @@ class Crypt {
* @param string $catFile concatenated data to be split
* @returns array keys: encrypted, iv
*/
- public static function splitIv ( $catFile ) {
+ public static function splitIv($catFile) {
// Fetch encryption metadata from end of file
- $meta = substr( $catFile, -22 );
+ $meta = substr($catFile, -22);
// Fetch IV from end of file
- $iv = substr( $meta, -16 );
+ $iv = substr($meta, -16);
// Remove IV and IV identifier text to expose encrypted content
- $encrypted = substr( $catFile, 0, -22 );
+ $encrypted = substr($catFile, 0, -22);
$split = array(
- 'encrypted' => $encrypted
- , 'iv' => $iv
+ 'encrypted' => $encrypted,
+ 'iv' => $iv
);
return $split;
@@ -272,14 +277,16 @@ class Crypt {
/**
* @brief Symmetrically encrypts a string and returns keyfile content
- * @param $plainContent content to be encrypted in keyfile
- * @returns encrypted content combined with IV
+ * @param string $plainContent content to be encrypted in keyfile
+ * @param string $passphrase
+ * @return bool|string
+ * @return string encrypted content combined with IV
* @note IV need not be specified, as it will be stored in the returned keyfile
* and remain accessible therein.
*/
- public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
+ public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {
- if ( !$plainContent ) {
+ if (!$plainContent) {
return false;
@@ -287,18 +294,18 @@ class Crypt {
$iv = self::generateIv();
- if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
+ if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
// Combine content to encrypt with IV identifier and actual IV
- $catfile = self::concatIv( $encryptedContent, $iv );
+ $catfile = self::concatIv($encryptedContent, $iv);
- $padded = self::addPadding( $catfile );
+ $padded = self::addPadding($catfile);
return $padded;
} else {
- \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );
+ \OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);
return false;
@@ -309,31 +316,37 @@ class Crypt {
/**
* @brief Symmetrically decrypts keyfile content
- * @param string $source
- * @param string $target
- * @param string $key the decryption key
- * @returns decrypted content
+ * @param $keyfileContent
+ * @param string $passphrase
+ * @throws \Exception
+ * @return bool|string
+ * @internal param string $source
+ * @internal param string $target
+ * @internal param string $key the decryption key
+ * @returns string decrypted content
*
* This function decrypts a file
*/
- public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
+ public static function symmetricDecryptFileContent($keyfileContent, $passphrase = '') {
- if ( !$keyfileContent ) {
+ if (!$keyfileContent) {
- throw new \Exception( 'Encryption library: no data provided for decryption' );
+ throw new \Exception('Encryption library: no data provided for decryption');
}
// Remove padding
- $noPadding = self::removePadding( $keyfileContent );
+ $noPadding = self::removePadding($keyfileContent);
// Split into enc data and catfile
- $catfile = self::splitIv( $noPadding );
+ $catfile = self::splitIv($noPadding);
- if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
+ if ($plainContent = self::decrypt($catfile['encrypted'], $catfile['iv'], $passphrase)) {
return $plainContent;
+ } else {
+ return false;
}
}
@@ -346,15 +359,15 @@ class Crypt {
*
* This function decrypts a file
*/
- public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
+ public static function symmetricEncryptFileContentKeyfile($plainContent) {
$key = self::generateKey();
- if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
+ if ($encryptedContent = self::symmetricEncryptFileContent($plainContent, $key)) {
return array(
- 'key' => $key
- , 'encrypted' => $encryptedContent
+ 'key' => $key,
+ 'encrypted' => $encryptedContent
);
} else {
@@ -368,22 +381,41 @@ class Crypt {
/**
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
+ * @param array $publicKeys array keys must be the userId of corresponding user
+ * @returns array keys: keys (array, key = userId), data
+ * @note symmetricDecryptFileContent() can decrypt files created using this method
*/
- public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
+ public static function multiKeyEncrypt($plainContent, array $publicKeys) {
+
+ // openssl_seal returns false without errors if $plainContent
+ // is empty, so trigger our own error
+ if (empty($plainContent)) {
+
+ throw new \Exception('Cannot mutliKeyEncrypt empty plain content');
+
+ }
// Set empty vars to be set by openssl by reference
$sealed = '';
- $envKeys = array();
+ $shareKeys = array();
+ $mappedShareKeys = array();
- if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
+ if (openssl_seal($plainContent, $sealed, $shareKeys, $publicKeys)) {
+
+ $i = 0;
+
+ // Ensure each shareKey is labelled with its
+ // corresponding userId
+ foreach ($publicKeys as $userId => $publicKey) {
+
+ $mappedShareKeys[$userId] = $shareKeys[$i];
+ $i++;
+
+ }
return array(
- 'keys' => $envKeys
- , 'encrypted' => $sealed
+ 'keys' => $mappedShareKeys,
+ 'data' => $sealed
);
} else {
@@ -396,27 +428,31 @@ class Crypt {
/**
* @brief Asymmetrically encrypt a file using multiple public keys
- * @param string $plainContent content to be encrypted
+ * @param $encryptedContent
+ * @param $shareKey
+ * @param $privateKey
+ * @return bool
+ * @internal param string $plainContent content to be encrypted
* @returns string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
* This function decrypts a file
*/
- public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+ public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey) {
- if ( !$encryptedContent ) {
+ if (!$encryptedContent) {
return false;
}
- if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+ if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {
return $plainContent;
} else {
- \OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
+ \OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OCP\Util::ERROR);
return false;
@@ -425,12 +461,14 @@ class Crypt {
}
/**
- * @brief Asymmetrically encrypt a string using a public key
- * @returns encrypted file
+ * @brief Asymetrically encrypt a string using a public key
+ * @param $plainContent
+ * @param $publicKey
+ * @return string encrypted file
*/
- public static function keyEncrypt( $plainContent, $publicKey ) {
+ public static function keyEncrypt($plainContent, $publicKey) {
- openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+ openssl_public_encrypt($plainContent, $encryptedContent, $publicKey);
return $encryptedContent;
@@ -438,110 +476,19 @@ class Crypt {
/**
* @brief Asymetrically decrypt a file using a private key
- * @returns decrypted file
- */
- public static function keyDecrypt( $encryptedContent, $privatekey ) {
-
- openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
-
- return $plainContent;
-
- }
-
- /**
- * @brief Encrypts content symmetrically and generates keyfile asymmetrically
- * @returns array containing catfile and new keyfile.
- * keys: data, key
- * @note this method is a wrapper for combining other crypt class methods
- */
- public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
-
- // Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
-
- // Encrypt keyfile
- $cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
-
- return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
-
- }
-
- /**
- * @brief Takes catfile, keyfile, and private key, and
- * performs decryption
- * @returns decrypted content
- * @note this method is a wrapper for combining other crypt class methods
- */
- public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
-
- // Decrypt the keyfile with the user's private key
- $decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
-
- // Decrypt the catfile symmetrically using the decrypted keyfile
- $decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
-
- return $decryptedData;
-
- }
-
- /**
- * @brief Symmetrically encrypt a file by combining encrypted component data blocks
- */
- public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
-
- $crypted = '';
-
- $remaining = $plainContent;
-
- $testarray = array();
-
- while( strlen( $remaining ) ) {
-
- //echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
-
- // Encrypt a chunk of unencrypted data and add it to the rest
- $block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
-
- $padded = self::addPadding( $block );
-
- $crypted .= $block;
-
- $testarray[] = $block;
-
- // Remove the data already encrypted from remaining unencrypted data
- $remaining = substr( $remaining, 6126 );
-
- }
-
- return $crypted;
-
- }
-
-
- /**
- * @brief Symmetrically decrypt a file by combining encrypted component data blocks
+ * @param $encryptedContent
+ * @param $privatekey
+ * @return string decrypted file
*/
- public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
-
- $decrypted = '';
-
- $remaining = $crypted;
-
- $testarray = array();
-
- while( strlen( $remaining ) ) {
-
- $testarray[] = substr( $remaining, 0, 8192 );
-
- // Decrypt a chunk of unencrypted data and add it to the rest
- $decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
+ public static function keyDecrypt($encryptedContent, $privatekey) {
- // Remove the data already encrypted from remaining unencrypted data
- $remaining = substr( $remaining, 8192 );
+ $result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);
+ if ($result) {
+ return $plainContent;
}
- return $decrypted;
+ return $result;
}
@@ -551,24 +498,24 @@ class Crypt {
*/
public static function generateIv() {
- if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
+ if ($random = openssl_random_pseudo_bytes(12, $strong)) {
- if ( !$strong ) {
+ if (!$strong) {
// If OpenSSL indicates randomness is insecure, log error
- \OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );
+ \OCP\Util::writeLog('Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OCP\Util::WARN);
}
// We encode the iv purely for string manipulation
// purposes - it gets decoded before use
- $iv = base64_encode( $random );
+ $iv = base64_encode($random);
return $iv;
} else {
- throw new \Exception( 'Generating IV failed' );
+ throw new \Exception('Generating IV failed');
}
@@ -581,12 +528,12 @@ class Crypt {
public static function generateKey() {
// Generate key
- if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
+ if ($key = base64_encode(openssl_random_pseudo_bytes(183, $strong))) {
- if ( !$strong ) {
+ if (!$strong) {
// If OpenSSL indicates randomness is insecure, log error
- throw new \Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
+ throw new \Exception('Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()');
}
@@ -603,15 +550,15 @@ class Crypt {
/**
* @brief Get the blowfish encryption handeler for a key
* @param $key string (optional)
- * @return Crypt_Blowfish blowfish object
+ * @return \Crypt_Blowfish blowfish object
*
* if the key is left out, the default handeler will be used
*/
- public static function getBlowfish( $key = '' ) {
+ public static function getBlowfish($key = '') {
- if ( $key ) {
+ if ($key) {
- return new \Crypt_Blowfish( $key );
+ return new \Crypt_Blowfish($key);
} else {
@@ -621,13 +568,17 @@ class Crypt {
}
- public static function legacyCreateKey( $passphrase ) {
+ /**
+ * @param $passphrase
+ * @return mixed
+ */
+ public static function legacyCreateKey($passphrase) {
// Generate a random integer
- $key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
+ $key = mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999);
// Encrypt the key with the passphrase
- $legacyEncKey = self::legacyEncrypt( $key, $passphrase );
+ $legacyEncKey = self::legacyEncrypt($key, $passphrase);
return $legacyEncKey;
@@ -635,61 +586,79 @@ class Crypt {
/**
* @brief encrypts content using legacy blowfish system
- * @param $content the cleartext message you want to encrypt
- * @param $key the encryption key (optional)
- * @returns encrypted content
+ * @param string $content the cleartext message you want to encrypt
+ * @param string $passphrase
+ * @returns string encrypted content
*
* This function encrypts an content
*/
- public static function legacyEncrypt( $content, $passphrase = '' ) {
+ public static function legacyEncrypt($content, $passphrase = '') {
- $bf = self::getBlowfish( $passphrase );
+ $bf = self::getBlowfish($passphrase);
- return $bf->encrypt( $content );
+ return $bf->encrypt($content);
}
/**
* @brief decrypts content using legacy blowfish system
- * @param $content the cleartext message you want to decrypt
- * @param $key the encryption key (optional)
- * @returns cleartext content
+ * @param string $content the cleartext message you want to decrypt
+ * @param string $passphrase
+ * @return string cleartext content
*
* This function decrypts an content
*/
- public static function legacyDecrypt( $content, $passphrase = '' ) {
-
- $bf = self::getBlowfish( $passphrase );
-
- $decrypted = $bf->decrypt( $content );
+ private static function legacyDecrypt($content, $passphrase = '') {
- $trimmed = rtrim( $decrypted, "\0" );
+ $bf = self::getBlowfish($passphrase);
- return $trimmed;
+ $decrypted = $bf->decrypt($content);
+ return $decrypted;
}
- public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
-
- $decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
-
- $recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
-
- return $recrypted;
+ /**
+ * @param $data
+ * @param string $key
+ * @param int $maxLength
+ * @return string
+ */
+ public static function legacyBlockDecrypt($data, $key = '', $maxLength = 0) {
+ $result = '';
+ while (strlen($data)) {
+ $result .= self::legacyDecrypt(substr($data, 0, 8192), $key);
+ $data = substr($data, 8192);
+ }
+ if ($maxLength > 0) {
+ return substr($result, 0, $maxLength);
+ } else {
+ return rtrim($result, "\0");
+ }
}
/**
- * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
- * @param $legacyContent the legacy encrypted content to re-encrypt
- * @returns cleartext content
- *
- * This function decrypts an content
+ * @param $legacyEncryptedContent
+ * @param $legacyPassphrase
+ * @param $publicKeys
+ * @return array
*/
- public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
+ public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys) {
- // TODO: write me
+ $decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);
+
+ // Encrypt plain data, generate keyfile & encrypted file
+ $cryptedData = self::symmetricEncryptFileContentKeyfile($decrypted);
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);
+
+ return array(
+ 'data' => $cryptedData['encrypted'],
+ 'filekey' => $multiEncrypted['data'],
+ 'sharekeys' => $multiEncrypted['keys']
+ );
}
-}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
new file mode 100755
index 0000000000000000000000000000000000000000..e078ab35541154fee450f6840dde17ba607e4e93
--- /dev/null
+++ b/apps/files_encryption/lib/helper.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage registration of hooks an various helper methods
+ * @package OCA\Encryption
+ */
+class Helper {
+
+ /**
+ * @brief register share related hooks
+ *
+ */
+ public static function registerShareHooks() {
+
+ \OCP\Util::connectHook('OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared');
+ \OCP\Util::connectHook('OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared');
+ \OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare');
+ }
+
+ /**
+ * @brief register user related hooks
+ *
+ */
+ public static function registerUserHooks() {
+
+ \OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login');
+ \OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase');
+ \OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
+ \OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
+ }
+
+ /**
+ * @brief register filesystem related hooks
+ *
+ */
+ public static function registerFilesystemHooks() {
+
+ \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+ }
+
+ /**
+ * @brief setup user for files_encryption
+ *
+ * @param Util $util
+ * @param string $password
+ * @return bool
+ */
+ public static function setupUser($util, $password) {
+ // Check files_encryption infrastructure is ready for action
+ if (!$util->ready()) {
+
+ \OCP\Util::writeLog('Encryption library', 'User account "' . $util->getUserId()
+ . '" is not ready for encryption; configuration started', \OCP\Util::DEBUG);
+
+ if (!$util->setupServerSide($password)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * @brief enable recovery
+ *
+ * @param $recoveryKeyId
+ * @param $recoveryPassword
+ * @internal param \OCA\Encryption\Util $util
+ * @internal param string $password
+ * @return bool
+ */
+ public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
+ $view = new \OC\Files\View('/');
+
+ if ($recoveryKeyId === null) {
+ $recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
+ \OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
+ }
+
+ if (!$view->is_dir('/owncloud_private_key')) {
+ $view->mkdir('/owncloud_private_key');
+ }
+
+ if (
+ (!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
+ || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
+ ) {
+
+ $keypair = \OCA\Encryption\Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
+ $view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
+
+ // Save private key
+ $view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
+
+ // create control file which let us check later on if the entered password was correct.
+ $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
+ if (!$view->is_dir('/control-file')) {
+ $view->mkdir('/control-file');
+ }
+ $view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
+
+ \OC_FileProxy::$enabled = true;
+
+ // Set recoveryAdmin as enabled
+ \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+
+ $return = true;
+
+ } else { // get recovery key and check the password
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $return = $util->checkRecoveryPassword($recoveryPassword);
+ if ($return) {
+ \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+ }
+ }
+
+ return $return;
+ }
+
+
+ /**
+ * @brief disable recovery
+ *
+ * @param $recoveryPassword
+ * @return bool
+ */
+ public static function adminDisableRecovery($recoveryPassword) {
+ $util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $return = $util->checkRecoveryPassword($recoveryPassword);
+
+ if ($return) {
+ // Set recoveryAdmin as disabled
+ \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
+ }
+
+ return $return;
+ }
+
+
+ /**
+ * @brief checks if access is public/anonymous user
+ * @return bool
+ */
+ public static function isPublicAccess() {
+ if (\OCP\USER::getUser() === false
+ || (isset($_GET['service']) && $_GET['service'] == 'files'
+ && isset($_GET['t']))
+ ) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @brief Format a path to be relative to the /user/files/ directory
+ * @param string $path the absolute path
+ * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
+ */
+ public static function stripUserFilesPath($path) {
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+ $sliced = array_slice($split, 2);
+ $relPath = implode('/', $sliced);
+
+ return $relPath;
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 955877971540bf86144ec6048ec47742cefff752..e911c1785df5f74c89eecc8abd679b4e8b5f0bcb 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -28,19 +28,26 @@ namespace OCA\Encryption;
* @note Where a method requires a view object, it's root must be '/'
*/
class Keymanager {
-
+
/**
* @brief retrieve the ENCRYPTED private key from a user
- *
- * @return string private key or false
+ *
+ * @param \OC_FilesystemView $view
+ * @param string $user
+ * @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
- public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
-
- $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-
- $key = $view->file_get_contents( $path );
-
+ public static function getPrivateKey(\OC_FilesystemView $view, $user) {
+
+ $path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $key = $view->file_get_contents($path);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $key;
}
@@ -50,102 +57,152 @@ class Keymanager {
* @param $userId
* @return string public key or false
*/
- public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
-
- return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
-
+ public static function getPublicKey(\OC_FilesystemView $view, $userId) {
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
/**
- * @brief retrieve both keys from a user (private and public)
+ * @brief Retrieve a user's public and private key
* @param \OC_FilesystemView $view
* @param $userId
* @return array keys: privateKey, publicKey
*/
- public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
-
+ public static function getUserKeys(\OC_FilesystemView $view, $userId) {
+
return array(
- 'publicKey' => self::getPublicKey( $view, $userId )
- , 'privateKey' => self::getPrivateKey( $view, $userId )
+ 'publicKey' => self::getPublicKey($view, $userId),
+ 'privateKey' => self::getPrivateKey($view, $userId)
);
-
+
}
-
+
/**
- * @brief Retrieve public keys of all users with access to a file
- * @param string $path Path to file
- * @return array of public keys for the given file
- * @note Checks that the sharing app is enabled should be performed
- * by client code, that isn't checked here
+ * @brief Retrieve public keys for given users
+ * @param \OC_FilesystemView $view
+ * @param array $userIds
+ * @return array of public keys for the specified users
*/
- public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $path = ltrim( $path, '/' );
-
- $filepath = '/' . $userId . '/files/' . $filePath;
-
- // Check if sharing is enabled
- if ( OC_App::isEnabled( 'files_sharing' ) ) {
-
-
-
- } else {
-
- // check if it is a file owned by the user and not shared at all
- $userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
-
- if ( $userview->file_exists( $path ) ) {
-
- $users[] = $userId;
-
- }
-
- }
-
- $view = new \OC_FilesystemView( '/public-keys/' );
-
- $keylist = array();
-
- $count = 0;
-
- foreach ( $users as $user ) {
-
- $keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
-
+ public static function getPublicKeys(\OC_FilesystemView $view, array $userIds) {
+
+ $keys = array();
+
+ foreach ($userIds as $userId) {
+
+ $keys[$userId] = self::getPublicKey($view, $userId);
+
}
-
- return $keylist;
-
+
+ return $keys;
+
}
-
+
/**
* @brief store file encryption key
*
+ * @param \OC_FilesystemView $view
* @param string $path relative path of the file, including filename
- * @param string $key
+ * @param $userId
+ * @param $catfile
+ * @internal param string $key
* @return bool true/false
- * @note The keyfile is not encrypted here. Client code must
+ * @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
-
- $basePath = '/' . $userId . '/files_encryption/keyfiles';
-
- $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-
-
-
+ public static function setFileKey(\OC_FilesystemView $view, $path, $userId, $catfile) {
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util($view, \OCP\User::getUser());
+ list($owner, $filename) = $util->getUidAndFilename($path);
+
+ $basePath = '/' . $owner . '/files_encryption/keyfiles';
+
+ $targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+
+ if (!$view->is_dir($basePath . '/' . $targetPath)) {
+
+ // create all parent folders
+ $info = pathinfo($basePath . '/' . $targetPath);
+ $keyfileFolderName = $view->getLocalFolder($info['dirname']);
+
+ if (!file_exists($keyfileFolderName)) {
+
+ mkdir($keyfileFolderName, 0750, true);
+
+ }
+ }
+
+ // try reusing key file if part file
+ if (self::isPartialFilePath($targetPath)) {
+
+ $result = $view->file_put_contents(
+ $basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile);
+
} else {
- // Save the keyfile in parallel directory
- return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
+ $result = $view->file_put_contents($basePath . '/' . $targetPath . '.key', $catfile);
+
}
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
+ /**
+ * @brief Remove .path extension from a file path
+ * @param string $path Path that may identify a .part file
+ * @return string File path without .part extension
+ * @note this is needed for reusing keys
+ */
+ public static function fixPartialFilePath($path) {
+
+ if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
+
+ $newLength = strlen($path) - 5;
+ $fPath = substr($path, 0, $newLength);
+
+ return $fPath;
+
+ } else {
+
+ return $path;
+
+ }
+
+ }
+
+ /**
+ * @brief Check if a path is a .part file
+ * @param string $path Path that may identify a .part file
+ * @return bool
+ */
+ public static function isPartialFilePath($path) {
+
+ if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
@@ -156,168 +213,359 @@ class Keymanager {
* @note The keyfile returned is asymmetrically encrypted. Decryption
* of the keyfile must be performed by client code
*/
- public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $filePath_f = ltrim( $filePath, '/' );
-
- $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
-
- if ( $view->file_exists( $catfilePath ) ) {
-
- return $view->file_get_contents( $catfilePath );
-
+ public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath) {
+
+ // try reusing key file if part file
+ if (self::isPartialFilePath($filePath)) {
+
+ $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
+
+ if ($result) {
+
+ return $result;
+
+ }
+
+ }
+
+ $util = new Util($view, \OCP\User::getUser());
+
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $filePath_f = ltrim($filename, '/');
+
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ if ($view->file_exists($keyfilePath)) {
+
+ $result = $view->file_get_contents($keyfilePath);
+
} else {
-
- return false;
-
+
+ $result = false;
+
}
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
/**
* @brief Delete a keyfile
*
- * @param OC_FilesystemView $view
+ * @param \OC_FilesystemView $view
* @param string $userId username
* @param string $path path of the file the key belongs to
* @return bool Outcome of unlink operation
* @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
* /data/admin/files/mydoc.txt
*/
- public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
-
- // Unlink doesn't tell us if file was deleted (not found returns
- // true), so we perform our own test
- if ( $view->file_exists( $keyPath ) ) {
-
- return $view->unlink( $keyPath );
-
+ public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path) {
+
+ $trimmed = ltrim($path, '/');
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+
+ $result = false;
+
+ if ($view->is_dir($keyPath)) {
+
+ $result = $view->unlink($keyPath);
+
} else {
-
- \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
-
- return false;
-
+ if ($view->file_exists($keyPath . '.key')) {
+
+ $result = $view->unlink($keyPath . '.key');
+
+ }
+ }
+
+ if (!$result) {
+
+ \OCP\Util::writeLog('Encryption library',
+ 'Could not delete keyfile; does not exist: "' . $keyPath, \OCP\Util::ERROR);
+
}
-
+
+ return $result;
+
}
-
+
/**
* @brief store private key from the user
- * @param string key
+ * @param string $key
* @return bool
* @note Encryption of the private key must be performed by client code
* as no encryption takes place here
*/
- public static function setPrivateKey( $key ) {
-
+ public static function setPrivateKey($key) {
+
$user = \OCP\User::getUser();
-
- $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
-
+
+ $view = new \OC_FilesystemView('/' . $user . '/files_encryption');
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) )
- $view->mkdir( '' );
-
- return $view->file_put_contents( $user . '.private.key', $key );
+
+ if (!$view->file_exists(''))
+ $view->mkdir('');
+
+ $result = $view->file_put_contents($user . '.private.key', $key);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
}
-
+
/**
- * @brief store private keys from the user
+ * @brief store share key
*
- * @param string privatekey
- * @param string publickey
+ * @param \OC_FilesystemView $view
+ * @param string $path relative path of the file, including filename
+ * @param $userId
+ * @param $shareKey
+ * @internal param string $key
+ * @internal param string $dbClassName
* @return bool true/false
+ * @note The keyfile is not encrypted here. Client code must
+ * asymmetrically encrypt the keyfile before passing it to this method
+ */
+ public static function setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey) {
+
+ // Here we need the currently logged in user, while userId can be a different user
+ $util = new Util($view, \OCP\User::getUser());
+
+ list($owner, $filename) = $util->getUidAndFilename($path);
+
+ $basePath = '/' . $owner . '/files_encryption/share-keys';
+
+ $shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+
+ // try reusing key file if part file
+ if (self::isPartialFilePath($shareKeyPath)) {
+
+ $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+
+ } else {
+
+ $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+
+ }
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $result = $view->file_put_contents($writePath, $shareKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if (
+ is_int($result)
+ && $result > 0
+ ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief store multiple share keys for a single file
+ * @param \OC_FilesystemView $view
+ * @param $path
+ * @param array $shareKeys
+ * @return bool
*/
- public static function setUserKeys($privatekey, $publickey) {
-
- return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
-
+ public static function setShareKeys(\OC_FilesystemView $view, $path, array $shareKeys) {
+
+ // $shareKeys must be an array with the following format:
+ // [userId] => [encrypted key]
+
+ $result = true;
+
+ foreach ($shareKeys as $userId => $shareKey) {
+
+ if (!self::setShareKey($view, $path, $userId, $shareKey)) {
+
+ // If any of the keys are not set, flag false
+ $result = false;
+
+ }
+
+ }
+
+ // Returns false if any of the keys weren't set
+ return $result;
+
}
-
+
/**
- * @brief store public key of the user
- *
- * @param string key
- * @return bool true/false
+ * @brief retrieve shareKey for an encrypted file
+ * @param \OC_FilesystemView $view
+ * @param string $userId
+ * @param string $filePath
+ * @internal param \OCA\Encryption\file $string name
+ * @return string file key or false
+ * @note The sharekey returned is encrypted. Decryption
+ * of the keyfile must be performed by client code
*/
- public static function setPublicKey( $key ) {
-
- $view = new \OC_FilesystemView( '/public-keys' );
-
+ public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath) {
+
+ // try reusing key file if part file
+ if (self::isPartialFilePath($filePath)) {
+
+ $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
+
+ if ($result) {
+
+ return $result;
+
+ }
+
+ }
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) )
- $view->mkdir( '' );
-
- return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
-
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util($view, \OCP\User::getUser());
+
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath(
+ '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
+
+ if ($view->file_exists($shareKeyPath)) {
+
+ $result = $view->file_get_contents($shareKeyPath);
+
+ } else {
+
+ $result = false;
+
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
/**
- * @brief store file encryption key
+ * @brief delete all share keys of a given file
+ * @param \OC_FilesystemView $view
+ * @param string $userId owner of the file
+ * @param string $filePath path to the file, relative to the owners file dir
+ */
+ public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
+
+ if ($view->is_dir($userId . '/files/' . $filePath)) {
+ $view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
+ } else {
+ $localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
+ $matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+ foreach ($matches as $ma) {
+ $result = unlink($ma);
+ if (!$result) {
+ \OCP\Util::writeLog('Encryption library',
+ 'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OCP\Util::ERROR);
+ }
+ }
+ }
+ }
+
+ /**
+ * @brief Delete a single user's shareKey for a single file
+ */
+ public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath) {
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util($view, \OCP\User::getUser());
+
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+
+ if ($view->is_dir($shareKeyPath)) {
+
+ $localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
+ self::recursiveDelShareKeys($localPath, $userIds);
+
+ } else {
+
+ foreach ($userIds as $userId) {
+
+ if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
+ \OCP\Util::writeLog('Encryption library',
+ 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId
+ . '.shareKey"', \OCP\Util::ERROR);
+ }
+
+ }
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ /**
+ * @brief recursively delete share keys from given users
*
- * @param string $path relative path of the file, including filename
- * @param string $key
- * @param null $view
- * @param string $dbClassName
- * @return bool true/false
- * @note The keyfile is not encrypted here. Client code must
- * asymmetrically encrypt the keyfile before passing it to this method
+ * @param string $dir directory
+ * @param array $userIds user ids for which the share keys should be deleted
*/
- public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
-
- $basePath = '/' . $userId . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
-
+ private static function recursiveDelShareKeys($dir, $userIds) {
+ foreach ($userIds as $userId) {
+ $matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
+ }
+ /** @var $matches array */
+ foreach ($matches as $ma) {
+ if (!unlink($ma)) {
+ \OCP\Util::writeLog('Encryption library',
+ 'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
+ }
+ }
+ $subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
+ foreach ($subdirs as $subdir) {
+ self::recursiveDelShareKeys($subdir, $userIds);
+ }
}
-
+
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
- public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
-
- $targetPath = ltrim( $path, '/' );
-
- $path_parts = pathinfo( $targetPath );
-
+ public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) {
+
+ $targetPath = ltrim($path, '/');
+
+ $path_parts = pathinfo($targetPath);
+
// If the file resides within a subdirectory, create it
- if (
- isset( $path_parts['dirname'] )
- && ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
+ if (
+ isset($path_parts['dirname'])
+ && !$view->file_exists($basePath . '/' . $path_parts['dirname'])
) {
-
- $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
-
+ $sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
+ $dir = '';
+ foreach ($sub_dirs as $sub_dir) {
+ $dir .= '/' . $sub_dir;
+ if (!$view->is_dir($dir)) {
+ $view->mkdir($dir);
+ }
+ }
}
-
+
return $targetPath;
-
- }
- /**
- * @brief Fetch the legacy encryption key from user files
- * @param string $login used to locate the legacy key
- * @param string $passphrase used to decrypt the legacy key
- * @return true / false
- *
- * if the key is left out, the default handler will be used
- */
- public function getLegacyKey() {
-
- $user = \OCP\User::getUser();
- $view = new \OC_FilesystemView( '/' . $user );
- return $view->file_get_contents( 'encryption.key' );
-
}
-
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 55cddf2bec81761ca0b6ccbcd27d7fbce7237219..0df34a38bd74e0e3102bebce151496e2e83d3964 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -1,41 +1,45 @@
<?php
/**
-* ownCloud
-*
-* @author Sam Tuke, Robin Appelman
-* @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
-* icewind1991@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Sam Tuke, Robin Appelman
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
+ * icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
/**
-* @brief Encryption proxy which handles filesystem operations before and after
-* execution and encrypts, and handles keyfiles accordingly. Used for
-* webui.
-*/
+ * @brief Encryption proxy which handles filesystem operations before and after
+ * execution and encrypts, and handles keyfiles accordingly. Used for
+ * webui.
+ */
namespace OCA\Encryption;
+/**
+ * Class Proxy
+ * @package OCA\Encryption
+ */
class Proxy extends \OC_FileProxy {
private static $blackList = null; //mimetypes blacklisted from encryption
-
+
private static $enableEncryption = null;
-
+
/**
* Check if a file requires encryption
* @param string $path
@@ -43,347 +47,383 @@ class Proxy extends \OC_FileProxy {
*
* Tests if server side encryption is enabled, and file is allowed by blacklists
*/
- private static function shouldEncrypt( $path ) {
-
- if ( is_null( self::$enableEncryption ) ) {
-
- if (
- \OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
- && Crypt::mode() == 'server'
+ private static function shouldEncrypt($path) {
+
+ if (is_null(self::$enableEncryption)) {
+
+ if (
+ \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
+ && Crypt::mode() === 'server'
) {
-
+
self::$enableEncryption = true;
-
+
} else {
-
+
self::$enableEncryption = false;
-
+
}
-
+
}
-
- if ( !self::$enableEncryption ) {
-
+
+ if (!self::$enableEncryption) {
+
return false;
-
+
}
-
- if ( is_null(self::$blackList ) ) {
-
- self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
-
+
+ if (is_null(self::$blackList)) {
+
+ self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
+
}
-
- if ( Crypt::isCatfile( $path ) ) {
-
+
+ if (Crypt::isCatfileContent($path)) {
+
return true;
-
+
}
-
- $extension = substr( $path, strrpos( $path, '.' ) +1 );
-
- if ( array_search( $extension, self::$blackList ) === false ) {
-
+
+ $extension = substr($path, strrpos($path, '.') + 1);
+
+ if (array_search($extension, self::$blackList) === false) {
+
return true;
-
+
}
-
+
return false;
}
-
- public function preFile_put_contents( $path, &$data ) {
-
- if ( self::shouldEncrypt( $path ) ) {
-
- if ( !is_resource( $data ) ) { //stream put contents should have been converted to fopen
-
- $userId = \OCP\USER::getUser();
-
- $rootView = new \OC_FilesystemView( '/' );
-
- // Set the filesize for userland, before encrypting
- $size = strlen( $data );
-
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- // TODO: Check if file is shared, if so, use multiKeyEncrypt
-
- // Encrypt plain data and fetch key
- $encrypted = Crypt::keyEncryptKeyfile( $data, Keymanager::getPublicKey( $rootView, $userId ) );
-
- // Replace plain content with encrypted content by reference
- $data = $encrypted['data'];
-
- $filePath = explode( '/', $path );
-
- $filePath = array_slice( $filePath, 3 );
-
- $filePath = '/' . implode( '/', $filePath );
-
- // TODO: make keyfile dir dynamic from app config
-
- $view = new \OC_FilesystemView( '/' );
-
- // Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $view, $filePath, $userId, $encrypted['key'] );
-
- // Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
-
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = true;
-
+
+ /**
+ * @param $path
+ * @param $data
+ * @return bool
+ */
+ public function preFile_put_contents($path, &$data) {
+
+ if (self::shouldEncrypt($path)) {
+
+ if (!is_resource($data)) {
+
+ // get root view
+ $view = new \OC_FilesystemView('/');
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ if (!isset($relativePath)) {
+ return true;
+ }
+
+ $handle = fopen('crypt://' . $relativePath . '.etmp', 'w');
+ if (is_resource($handle)) {
+
+ // write data to stream
+ fwrite($handle, $data);
+
+ // close stream
+ fclose($handle);
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get encrypted content
+ $data = $view->file_get_contents($path . '.etmp');
+
+ // remove our temp file
+ $view->unlink($path . '.etmp');
+
+ // re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
}
-
+
+ return true;
+
}
-
+
/**
* @param string $path Path of file from which has been read
* @param string $data Data that has been read from file
*/
- public function postFile_get_contents( $path, $data ) {
-
- // TODO: Use dependency injection to add required args for view and user etc. to this method
+ public function postFile_get_contents($path, $data) {
+
+ $plainData = null;
+ $view = new \OC_FilesystemView('/');
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ // init session
+ $session = new \OCA\Encryption\Session($view);
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
// If data is a catfile
- if (
- Crypt::mode() == 'server'
- && Crypt::isCatfile( $data )
+ if (
+ Crypt::mode() === 'server'
+ && Crypt::isCatfileContent($data)
) {
-
- $split = explode( '/', $path );
-
- $filePath = array_slice( $split, 3 );
-
- $filePath = '/' . implode( '/', $filePath );
-
- //$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- $view = new \OC_FilesystemView( '' );
-
- $userId = \OCP\USER::getUser();
-
- // TODO: Check if file is shared, if so, use multiKeyDecrypt
-
- $encryptedKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
-
- $session = new Session();
-
- $decrypted = Crypt::keyDecryptKeyfile( $data, $encryptedKeyfile, $session->getPrivateKey( $split[1] ) );
-
+
+ $handle = fopen('crypt://' . $relativePath, 'r');
+
+ if (is_resource($handle)) {
+ while (($plainDataChunk = fgets($handle, 8192)) !== false) {
+ $plainData .= $plainDataChunk;
+ }
+ }
+
} elseif (
- Crypt::mode() == 'server'
- && isset( $_SESSION['legacyenckey'] )
- && Crypt::isEncryptedMeta( $path )
+ Crypt::mode() == 'server'
+ && \OC::$session->exists('legacyenckey')
+ && Crypt::isEncryptedMeta($path)
) {
-
- $decrypted = Crypt::legacyDecrypt( $data, $_SESSION['legacyenckey'] );
-
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $plainData = Crypt::legacyBlockDecrypt($data, $session->getLegacyKey());
+
+ \OC_FileProxy::$enabled = $proxyStatus;
}
-
- \OC_FileProxy::$enabled = true;
-
- if ( ! isset( $decrypted ) ) {
-
- $decrypted = $data;
-
+
+ if (!isset($plainData)) {
+
+ $plainData = $data;
+
}
-
- return $decrypted;
-
+
+ return $plainData;
+
}
-
+
/**
* @brief When a file is deleted, remove its keyfile also
*/
- public function preUnlink( $path ) {
-
+ public function preUnlink($path) {
+
+ // let the trashbin handle this
+ if (\OCP\App::isEnabled('files_trashbin')) {
+ return true;
+ }
+
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView( '/' );
-
+
+ $view = new \OC_FilesystemView('/');
+
$userId = \OCP\USER::getUser();
-
- // Format path to be relative to user files dir
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 2 );
- $relPath = implode( '/', $sliced );
-
- if ( $view->is_dir( $path ) ) {
-
- // Dirs must be handled separately as deleteFileKey
- // doesn't handle them
- $view->unlink( $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath );
-
- } else {
-
- // Delete keyfile so it isn't orphaned
- $result = Keymanager::deleteFileKey( $view, $userId, $relPath );
-
- \OC_FileProxy::$enabled = true;
-
- return $result;
-
+
+ $util = new Util($view, $userId);
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ list($owner, $ownerPath) = $util->getUidAndFilename($relativePath);
+
+ // Delete keyfile & shareKey so it isn't orphaned
+ if (!Keymanager::deleteFileKey($view, $owner, $ownerPath)) {
+ \OCP\Util::writeLog('Encryption library',
+ 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OCP\Util::ERROR);
}
-
+
+ Keymanager::delAllShareKeys($view, $owner, $ownerPath);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // If we don't return true then file delete will fail; better
+ // to leave orphaned keyfiles than to disallow file deletion
+ return true;
+
}
/**
- * @brief When a file is renamed, rename its keyfile also
- * @return bool Result of rename()
- * @note This is pre rather than post because using post didn't work
+ * @param $path
+ * @return bool
*/
- public function preRename( $oldPath, $newPath ) {
-
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView( '/' );
-
- $userId = \OCP\USER::getUser();
-
- // Format paths to be relative to user files dir
- $oldTrimmed = ltrim( $oldPath, '/' );
- $oldSplit = explode( '/', $oldTrimmed );
- $oldSliced = array_slice( $oldSplit, 2 );
- $oldRelPath = implode( '/', $oldSliced );
- $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath . '.key';
-
- $newTrimmed = ltrim( $newPath, '/' );
- $newSplit = explode( '/', $newTrimmed );
- $newSliced = array_slice( $newSplit, 2 );
- $newRelPath = implode( '/', $newSliced );
- $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath . '.key';
-
- // Rename keyfile so it isn't orphaned
- $result = $view->rename( $oldKeyfilePath, $newKeyfilePath );
-
- \OC_FileProxy::$enabled = true;
-
- return $result;
-
+ public function postTouch($path) {
+ $this->handleFile($path);
+
+ return true;
}
-
- public function postFopen( $path, &$result ){
-
- if ( !$result ) {
-
+
+ /**
+ * @param $path
+ * @param $result
+ * @return resource
+ */
+ public function postFopen($path, &$result) {
+
+ if (!$result) {
+
return $result;
-
+
}
-
- // Reformat path for use with OC_FSV
- $path_split = explode( '/', $path );
- $path_f = implode( array_slice( $path_split, 3 ) );
-
+
+ // split the path parts
+ $pathParts = explode('/', $path);
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+ if (isset($pathParts[2]) && $pathParts[2] === 'cache') {
+ return $result;
+ }
+
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- $meta = stream_get_meta_data( $result );
-
- $view = new \OC_FilesystemView( '' );
-
- $util = new Util( $view, \OCP\USER::getUser());
-
+
+ $meta = stream_get_meta_data($result);
+
+ $view = new \OC_FilesystemView('');
+
+ $util = new Util($view, \OCP\USER::getUser());
+
// If file is already encrypted, decrypt using crypto protocol
- if (
- Crypt::mode() == 'server'
- && $util->isEncryptedPath( $path )
+ if (
+ Crypt::mode() === 'server'
+ && $util->isEncryptedPath($path)
) {
-
+
// Close the original encrypted file
- fclose( $result );
-
+ fclose($result);
+
// Open the file using the crypto stream wrapper
// protocol and let it do the decryption work instead
- $result = fopen( 'crypt://' . $path_f, $meta['mode'] );
-
-
- } elseif (
- self::shouldEncrypt( $path )
- and $meta ['mode'] != 'r'
- and $meta['mode'] != 'rb'
+ $result = fopen('crypt://' . $relativePath, $meta['mode']);
+
+ } elseif (
+ self::shouldEncrypt($path)
+ and $meta ['mode'] !== 'r'
+ and $meta['mode'] !== 'rb'
) {
- // If the file is not yet encrypted, but should be
- // encrypted when it's saved (it's not read only)
-
- // NOTE: this is the case for new files saved via WebDAV
-
- if (
- $view->file_exists( $path )
- and $view->filesize( $path ) > 0
- ) {
- $x = $view->file_get_contents( $path );
-
- $tmp = tmpfile();
-
-// // Make a temporary copy of the original file
-// \OCP\Files::streamCopy( $result, $tmp );
-//
-// // Close the original stream, we'll return another one
-// fclose( $result );
-//
-// $view->file_put_contents( $path_f, $tmp );
-//
-// fclose( $tmp );
-
- }
-
- $result = fopen( 'crypt://'.$path_f, $meta['mode'] );
-
+ $result = fopen('crypt://' . $relativePath, $meta['mode']);
}
-
+
// Re-enable the proxy
- \OC_FileProxy::$enabled = true;
-
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $result;
-
- }
- public function postGetMimeType( $path, $mime ) {
-
- if ( Crypt::isCatfile( $path ) ) {
-
- $mime = \OCP\Files::getMimeType( 'crypt://' . $path, 'w' );
-
- }
-
- return $mime;
-
}
- public function postStat( $path, $data ) {
-
- if ( Crypt::isCatfile( $path ) ) {
-
- $cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- $data['size'] = $cached['size'];
-
+ /**
+ * @param $path
+ * @param $data
+ * @return array
+ */
+ public function postGetFileInfo($path, $data) {
+
+ // if path is a folder do nothing
+ if (is_array($data) && array_key_exists('size', $data)) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get file size
+ $data['size'] = self::postFileSize($path, $data['size']);
+
+ // Re-enable the proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
}
-
+
return $data;
}
- public function postFileSize( $path, $size ) {
-
- if ( Crypt::isCatfile( $path ) ) {
-
- $cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- return $cached['size'];
-
- } else {
-
+ /**
+ * @param $path
+ * @param $size
+ * @return bool
+ */
+ public function postFileSize($path, $size) {
+
+ $view = new \OC_FilesystemView('/');
+
+ // if path is a folder do nothing
+ if ($view->is_dir($path)) {
return $size;
-
}
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ // if path is empty we cannot resolve anything
+ if (empty($relativePath)) {
+ return $size;
+ }
+
+ $fileInfo = false;
+ // get file info from database/cache if not .part file
+ if (!Keymanager::isPartialFilePath($path)) {
+ $fileInfo = $view->getFileInfo($path);
+ }
+
+ // if file is encrypted return real file size
+ if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+ $size = $fileInfo['unencrypted_size'];
+ } else {
+ // self healing if file was removed from file cache
+ if (!is_array($fileInfo)) {
+ $fileInfo = array();
+ }
+
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $fixSize = $util->getFileSize($path);
+ if ($fixSize > 0) {
+ $size = $fixSize;
+
+ $fileInfo['encrypted'] = true;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info if not .part file
+ if (!Keymanager::isPartialFilePath($relativePath)) {
+ $view->putFileInfo($path, $fileInfo);
+ }
+ }
+
+ }
+ return $size;
+ }
+
+ /**
+ * @param $path
+ */
+ public function handleFile($path) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+
+ // split the path parts
+ $pathParts = explode('/', $path);
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ // only if file is on 'files' folder fix file size and sharing
+ if (isset($pathParts[2]) && $pathParts[2] === 'files' && $util->fixFileSize($path)) {
+
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $relativePath);
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $relativePath);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
}
}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 769a40b359f4f7249c9fcc44353de603f66cdd63..bff1737554b4bea7a231135ec6affc4d341a7fef 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -28,76 +28,164 @@ namespace OCA\Encryption;
class Session {
+ private $view;
+
+ /**
+ * @brief if session is started, check if ownCloud key pair is set up, if not create it
+ * @param \OC_FilesystemView $view
+ *
+ * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
+ */
+ public function __construct($view) {
+
+ $this->view = $view;
+
+ if (!$this->view->is_dir('owncloud_private_key')) {
+
+ $this->view->mkdir('owncloud_private_key');
+
+ }
+
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+ if ($publicShareKeyId === null) {
+ $publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
+ \OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
+ }
+
+ if (
+ !$this->view->file_exists("/public-keys/" . $publicShareKeyId . ".public.key")
+ || !$this->view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".private.key")
+ ) {
+
+ $keypair = Crypt::createKeypair();
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
+ $this->view->file_put_contents('/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey']);
+
+ // Encrypt private key empty passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '');
+
+ // Save private key
+ $this->view->file_put_contents(
+ '/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ }
+
+ if (\OCA\Encryption\Helper::isPublicAccess()) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
+ $this->setPublicSharePrivateKey( $privateKey );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ }
+
/**
* @brief Sets user private key to session
+ * @param string $privateKey
* @return bool
*
+ * @note this should only be set on login
*/
- public function setPrivateKey( $privateKey ) {
-
- $_SESSION['privateKey'] = $privateKey;
-
+ public function setPrivateKey($privateKey) {
+
+ \OC::$session->set('privateKey', $privateKey);
+
return true;
-
+
}
-
+
/**
- * @brief Gets user private key from session
+ * @brief Gets user or public share private key from session
* @returns string $privateKey The user's plaintext private key
*
*/
public function getPrivateKey() {
-
- if (
- isset( $_SESSION['privateKey'] )
- && !empty( $_SESSION['privateKey'] )
- ) {
-
- return $_SESSION['privateKey'];
-
+ // return the public share private key if this is a public access
+ if (\OCA\Encryption\Helper::isPublicAccess()) {
+ return $this->getPublicSharePrivateKey();
} else {
-
- return false;
-
+ if (!is_null( \OC::$session->get('privateKey') )) {
+ return \OC::$session->get('privateKey');
+ } else {
+ return false;
+ }
}
-
}
-
+
/**
- * @brief Sets user legacy key to session
+ * @brief Sets public user private key to session
+ * @param string $privateKey
* @return bool
+ */
+ public function setPublicSharePrivateKey($privateKey) {
+
+ \OC::$session->set('publicSharePrivateKey', $privateKey);
+
+ return true;
+
+ }
+
+ /**
+ * @brief Gets public share private key from session
+ * @returns string $privateKey
*
*/
- public function setLegacyKey( $legacyKey ) {
-
- if ( $_SESSION['legacyKey'] = $legacyKey ) {
-
- return true;
-
+ public function getPublicSharePrivateKey() {
+
+ if (!is_null( \OC::$session->get('publicSharePrivateKey') )) {
+ return \OC::$session->get('publicSharePrivateKey');
+ } else {
+ return false;
}
-
}
-
+
+
+ /**
+ * @brief Sets user legacy key to session
+ * @param $legacyKey
+ * @return bool
+ */
+ public function setLegacyKey($legacyKey) {
+
+ \OC::$session->set('legacyKey', $legacyKey);
+
+ return true;
+ }
+
/**
* @brief Gets user legacy key from session
* @returns string $legacyKey The user's plaintext legacy key
*
*/
public function getLegacyKey() {
-
- if (
- isset( $_SESSION['legacyKey'] )
- && !empty( $_SESSION['legacyKey'] )
- ) {
-
- return $_SESSION['legacyKey'];
-
+
+ if ( !is_null( \OC::$session->get('legacyKey') ) ) {
+
+ return \OC::$session->get('legacyKey');
+
} else {
-
+
return false;
-
+
}
-
+
}
-}
\ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 65d7d57a05a740bd164e7476b1c3910afcd7f49f..072c52866445e91f7157a739ca2e939ccdc846b7 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -3,7 +3,7 @@
* ownCloud
*
* @author Robin Appelman
- * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
* <icewind1991@gmail.com>
*
* This library is free software; you can redistribute it and/or
@@ -32,27 +32,28 @@ namespace OCA\Encryption;
/**
* @brief Provides 'crypt://' stream wrapper protocol.
- * @note We use a stream wrapper because it is the most secure way to handle
+ * @note We use a stream wrapper because it is the most secure way to handle
* decrypted content transfers. There is no safe way to decrypt the entire file
* somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
* @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
- * crypt://filename, or crypt://subdirectory/filename, NOT
- * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
- * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
+ * crypt://filename, or crypt://subdirectory/filename, NOT
+ * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
+ * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
* will not be accessible to other methods.
- * @note Data read and written must always be 8192 bytes long, as this is the
- * buffer size used internally by PHP. The encryption process makes the input
- * data longer, and input is chunked into smaller pieces in order to result in
+ * @note Data read and written must always be 8192 bytes long, as this is the
+ * buffer size used internally by PHP. The encryption process makes the input
+ * data longer, and input is chunked into smaller pieces in order to result in
* a 8192 encrypted block size.
+ * @note When files are deleted via webdav, or when they are updated and the
+ * previous version deleted, this is handled by OC\Files\View, and thus the
+ * encryption proxies are used and keyfiles deleted.
*/
class Stream {
+ private $plainKey;
+ private $encKeyfiles;
- public static $sourceStreams = array();
-
- // TODO: make all below properties private again once unit testing is
- // configured correctly
- public $rawPath; // The raw path received by stream_open
- public $path_f; // The raw path formatted to include username and data dir
+ private $rawPath; // The raw path relative to the data dir
+ private $relPath; // rel path to users file dir
private $userId;
private $handle; // Resource returned by fopen
private $path;
@@ -60,226 +61,191 @@ class Stream {
private $meta = array(); // Header / meta for source stream
private $count;
private $writeCache;
- public $size;
+ private $size;
+ private $unencryptedSize;
private $publicKey;
private $keyfile;
private $encKeyfile;
private static $view; // a fsview object set to user dir
private $rootView; // a fsview object set to '/'
- public function stream_open( $path, $mode, $options, &$opened_path ) {
-
- // Get access to filesystem via filesystemview object
- if ( !self::$view ) {
-
- self::$view = new \OC_FilesystemView( $this->userId . '/' );
+ /**
+ * @param $path
+ * @param $mode
+ * @param $options
+ * @param $opened_path
+ * @return bool
+ */
+ public function stream_open($path, $mode, $options, &$opened_path) {
+ if (!isset($this->rootView)) {
+ $this->rootView = new \OC_FilesystemView('/');
}
-
- // Set rootview object if necessary
- if ( ! $this->rootView ) {
- $this->rootView = new \OC_FilesystemView( $this->userId . '/' );
+ $util = new Util($this->rootView, \OCP\USER::getUser());
- }
-
- $this->userId = \OCP\User::getUser();
-
- // Get the bare file path
- $path = str_replace( 'crypt://', '', $path );
-
- $this->rawPath = $path;
-
- $this->path_f = $this->userId . '/files/' . $path;
-
- if (
- dirname( $path ) == 'streams'
- and isset( self::$sourceStreams[basename( $path )] )
- ) {
-
- // Is this just for unit testing purposes?
+ $this->userId = $util->getUserId();
- $this->handle = self::$sourceStreams[basename( $path )]['stream'];
+ // Strip identifier text from path, this gives us the path relative to data/<user>/files
+ $this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
- $this->path = self::$sourceStreams[basename( $path )]['path'];
+ // rawPath is relative to the data directory
+ $this->rawPath = $util->getUserFilesDir() . $this->relPath;
- $this->size = self::$sourceStreams[basename( $path )]['size'];
+ // Disable fileproxies so we can get the file size and open the source file without recursive encryption
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- } else {
+ if (
+ $mode === 'w'
+ or $mode === 'w+'
+ or $mode === 'wb'
+ or $mode === 'wb+'
+ ) {
- if (
- $mode == 'w'
- or $mode == 'w+'
- or $mode == 'wb'
- or $mode == 'wb+'
- ) {
+ // We're writing a new file so start write counter with 0 bytes
+ $this->size = 0;
+ $this->unencryptedSize = 0;
- $this->size = 0;
+ } else {
- } else {
-
-
-
- $this->size = self::$view->filesize( $this->path_f, $mode );
-
- //$this->size = filesize( $path );
-
- }
+ $this->size = $this->rootView->filesize($this->rawPath, $mode);
+ }
- // Disable fileproxies so we can open the source file without recursive encryption
- \OC_FileProxy::$enabled = false;
+ $this->handle = $this->rootView->fopen($this->rawPath, $mode);
- //$this->handle = fopen( $path, $mode );
-
- $this->handle = self::$view->fopen( $this->path_f, $mode );
-
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
- if ( !is_resource( $this->handle ) ) {
+ if (!is_resource($this->handle)) {
- \OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
+ \OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
- }
+ } else {
+
+ $this->meta = stream_get_meta_data($this->handle);
}
- if ( is_resource( $this->handle ) ) {
- $this->meta = stream_get_meta_data( $this->handle );
+ return is_resource($this->handle);
- }
+ }
- return is_resource( $this->handle );
+ /**
+ * @param $offset
+ * @param int $whence
+ */
+ public function stream_seek($offset, $whence = SEEK_SET) {
- }
-
- public function stream_seek( $offset, $whence = SEEK_SET ) {
-
$this->flush();
-
- fseek( $this->handle, $offset, $whence );
-
- }
-
- public function stream_tell() {
- return ftell($this->handle);
+
+ fseek($this->handle, $offset, $whence);
+
}
-
- public function stream_read( $count ) {
-
+
+ /**
+ * @param $count
+ * @return bool|string
+ * @throws \Exception
+ */
+ public function stream_read($count) {
+
$this->writeCache = '';
- if ( $count != 8192 ) {
-
+ if ($count !== 8192) {
+
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
- \OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
+ \OCP\Util::writeLog('files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
die();
}
-// $pos = ftell( $this->handle );
-//
// Get the data from the file handle
- $data = fread( $this->handle, 8192 );
-
- if ( strlen( $data ) ) {
-
- $this->getKey();
-
- $result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
-
- } else {
+ $data = fread($this->handle, 8192);
- $result = '';
+ $result = '';
- }
+ if (strlen($data)) {
+
+ if (!$this->getKey()) {
+
+ // Error! We don't have a key to decrypt the file with
+ throw new \Exception(
+ 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
+
+ }
+
+ // Decrypt data
+ $result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
-// $length = $this->size - $pos;
-//
-// if ( $length < 8192 ) {
-//
-// $result = substr( $result, 0, $length );
-//
-// }
+ }
return $result;
}
-
+
/**
* @brief Encrypt and pad data ready for writing to disk
* @param string $plainData data to be encrypted
* @param string $key key to use for encryption
- * @return encrypted data on success, false on failure
+ * @return string encrypted data on success, false on failure
*/
- public function preWriteEncrypt( $plainData, $key ) {
-
+ public function preWriteEncrypt($plainData, $key) {
+
// Encrypt data to 'catfile', which includes IV
- if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
-
- return $encrypted;
-
+ if ($encrypted = Crypt::symmetricEncryptFileContent($plainData, $key)) {
+
+ return $encrypted;
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
- * @brief Get the keyfile for the current file, generate one if necessary
- * @param bool $generate if true, a new key will be generated if none can be found
+ * @brief Fetch the plain encryption key for the file and set it as plainKey property
+ * @internal param bool $generate if true, a new key will be generated if none can be found
* @return bool true on key found and set, false on key not found and new key generated and set
*/
public function getKey() {
-
- // If a keyfile already exists for a file named identically to
- // file to be written
- if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
-
- // TODO: add error handling for when file exists but no
- // keyfile
-
- // Fetch existing keyfile
- $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->rawPath );
-
- $this->getUser();
-
- $session = new Session();
-
- $privateKey = $session->getPrivateKey( $this->userId );
-
- $this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey );
-
+
+ // Check if key is already set
+ if (isset($this->plainKey) && isset($this->encKeyfile)) {
+
return true;
-
+
+ }
+
+ // Fetch and decrypt keyfile
+ // Fetch existing keyfile
+ $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->userId, $this->relPath);
+
+ // If a keyfile already exists
+ if ($this->encKeyfile) {
+
+ $session = new \OCA\Encryption\Session( $this->rootView );
+
+ $privateKey = $session->getPrivateKey($this->userId);
+
+ $shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+
+ $this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $privateKey);
+
+ return true;
+
} else {
-
+
return false;
-
- }
-
- }
-
- public function getuser() {
-
- // Only get the user again if it isn't already set
- if ( empty( $this->userId ) ) {
-
- // TODO: Move this user call out of here - it belongs
- // elsewhere
- $this->userId = \OCP\User::getUser();
-
+
}
-
- // TODO: Add a method for getting the user in case OCP\User::
- // getUser() doesn't work (can that scenario ever occur?)
-
+
}
-
+
/**
* @brief Handle plain data from the stream, and write it in 8192 byte blocks
* @param string $data data to be written to disk
@@ -289,99 +255,55 @@ class Stream {
* @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
* @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
*/
- public function stream_write( $data ) {
-
+ public function stream_write($data) {
+
// Disable the file proxies so that encryption is not
// automatically attempted when the file is written to disk -
// we are handling that separately here and we don't want to
// get into an infinite loop
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
// Get the length of the unencrypted data that we are handling
- $length = strlen( $data );
-
- // So far this round, no data has been written
- $written = 0;
-
- // Find out where we are up to in the writing of data to the
+ $length = strlen($data);
+
+ // Find out where we are up to in the writing of data to the
// file
- $pointer = ftell( $this->handle );
-
- // Make sure the userId is set
- $this->getuser();
-
- // TODO: Check if file is shared, if so, use multiKeyEncrypt and
- // save shareKeys in necessary user directories
-
+ $pointer = ftell($this->handle);
+
// Get / generate the keyfile for the file we're handling
// If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
- if ( ! $this->getKey() ) {
-
- $this->keyfile = Crypt::generateKey();
-
- $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
-
- $this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
-
- $view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
-
- // Save the new encrypted file key
- Keymanager::setFileKey( $view, $this->rawPath, $userId, $this->encKeyfile );
-
+ if (!$this->getKey()) {
+
+ $this->plainKey = Crypt::generateKey();
+
}
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
- if ( $this->writeCache ) {
-
+ if ($this->writeCache) {
+
// Concat writeCache to start of $data
$data = $this->writeCache . $data;
-
- // Clear the write cache, ready for resuse - it has been
+
+ // Clear the write cache, ready for reuse - it has been
// flushed and its old contents processed
$this->writeCache = '';
}
-//
-// // Make sure we always start on a block start
- if ( 0 != ( $pointer % 8192 ) ) {
- // if the current position of
- // file indicator is not aligned to a 8192 byte block, fix it
- // so that it is
-
-// fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
-//
-// $pointer = ftell( $this->handle );
-//
-// $unencryptedNewBlock = fread( $this->handle, 8192 );
-//
-// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-//
-// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
-//
-// $x = substr( $block, 0, $currentPos % 8192 );
-//
-// $data = $x . $data;
-//
-// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-//
- }
-// $currentPos = ftell( $this->handle );
-
-// // While there still remains somed data to be processed & written
- while( strlen( $data ) > 0 ) {
-//
-// // Remaining length for this iteration, not of the
-// // entire file (may be greater than 8192 bytes)
-// $remainingLength = strlen( $data );
-//
-// // If data remaining to be written is less than the
-// // size of 1 6126 byte block
- if ( strlen( $data ) < 6126 ) {
-
+ // While there still remains some data to be processed & written
+ while (strlen($data) > 0) {
+
+ // Remaining length for this iteration, not of the
+ // entire file (may be greater than 8192 bytes)
+ $remainingLength = strlen($data);
+
+ // If data remaining to be written is less than the
+ // size of 1 6126 byte block
+ if ($remainingLength < 6126) {
+
// Set writeCache to contents of $data
// The writeCache will be carried over to the
// next write round, and added to the start of
@@ -394,101 +316,167 @@ class Stream {
// Clear $data ready for next round
$data = '';
-//
+
} else {
-
+
// Read the chunk from the start of $data
- $chunk = substr( $data, 0, 6126 );
-
- $encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
-
+ $chunk = substr($data, 0, 6126);
+
+ $encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
+
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
- fwrite( $this->handle, $encrypted );
-
- $writtenLen = strlen( $encrypted );
- //fseek( $this->handle, $writtenLen, SEEK_CUR );
+ fwrite($this->handle, $encrypted);
- // Remove the chunk we just processed from
+ // Remove the chunk we just processed from
// $data, leaving only unprocessed data in $data
// var, for handling on the next round
- $data = substr( $data, 6126 );
+ $data = substr($data, 6126);
}
-
+
}
- $this->size = max( $this->size, $pointer + $length );
-
+ $this->size = max($this->size, $pointer + $length);
+ $this->unencryptedSize += $length;
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $length;
}
- public function stream_set_option( $option, $arg1, $arg2 ) {
- switch($option) {
+ /**
+ * @param $option
+ * @param $arg1
+ * @param $arg2
+ */
+ public function stream_set_option($option, $arg1, $arg2) {
+ $return = false;
+ switch ($option) {
case STREAM_OPTION_BLOCKING:
- stream_set_blocking( $this->handle, $arg1 );
+ $return = stream_set_blocking($this->handle, $arg1);
break;
case STREAM_OPTION_READ_TIMEOUT:
- stream_set_timeout( $this->handle, $arg1, $arg2 );
+ $return = stream_set_timeout($this->handle, $arg1, $arg2);
break;
case STREAM_OPTION_WRITE_BUFFER:
- stream_set_write_buffer( $this->handle, $arg1, $arg2 );
+ $return = stream_set_write_buffer($this->handle, $arg1);
}
+
+ return $return;
}
+ /**
+ * @return array
+ */
public function stream_stat() {
return fstat($this->handle);
}
-
- public function stream_lock( $mode ) {
- flock( $this->handle, $mode );
+
+ /**
+ * @param $mode
+ */
+ public function stream_lock($mode) {
+ return flock($this->handle, $mode);
}
-
+
+ /**
+ * @return bool
+ */
public function stream_flush() {
-
- return fflush( $this->handle );
+
+ return fflush($this->handle);
// Not a typo: http://php.net/manual/en/function.fflush.php
-
+
}
+ /**
+ * @return bool
+ */
public function stream_eof() {
return feof($this->handle);
}
private function flush() {
-
- if ( $this->writeCache ) {
-
+
+ if ($this->writeCache) {
+
// Set keyfile property for file in question
$this->getKey();
-
- $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
-
- fwrite( $this->handle, $encrypted );
-
+
+ $encrypted = $this->preWriteEncrypt($this->writeCache, $this->plainKey);
+
+ fwrite($this->handle, $encrypted);
+
$this->writeCache = '';
-
+
}
-
+
}
+ /**
+ * @return bool
+ */
public function stream_close() {
-
+
$this->flush();
- if (
- $this->meta['mode']!='r'
- and $this->meta['mode']!='rb'
+ if (
+ $this->meta['mode'] !== 'r'
+ and $this->meta['mode'] !== 'rb'
+ and $this->size > 0
) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Fetch user's public key
+ $this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
+
+ // Check if OC sharing api is enabled
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ $util = new Util($this->rootView, $this->userId);
+
+ // Get all users sharing the file includes current user
+ $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+
+ // Fetch public keys for all sharing users
+ $publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
+
+ // Encrypt enc key for all sharing users
+ $this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
+
+ $view = new \OC_FilesystemView('/');
+
+ // Save the new encrypted file key
+ Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
+
+ // Save the sharekeys
+ Keymanager::setShareKeys($view, $this->relPath, $this->encKeyfiles['keys']);
+
+ // get file info
+ $fileInfo = $view->getFileInfo($this->rawPath);
+ if (!is_array($fileInfo)) {
+ $fileInfo = array();
+ }
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
- \OC\Files\Filesystem::putFileInfo( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
+ // set encryption data
+ $fileInfo['encrypted'] = true;
+ $fileInfo['size'] = $this->size;
+ $fileInfo['unencrypted_size'] = $this->unencryptedSize;
+ // set fileinfo
+ $view->putFileInfo($this->rawPath, $fileInfo);
}
- return fclose( $this->handle );
+ return fclose($this->handle);
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 52bc74db27a61ee0c26af4e2b2cffdca8b2df419..04bd4dc8aca5711678bbbef1d0c7b22ff6885de2 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -3,8 +3,8 @@
* ownCloud
*
* @author Sam Tuke, Frank Karlitschek
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Frank Karlitschek frank@owncloud.org
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>,
+ * Frank Karlitschek <frank@owncloud.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,78 +21,82 @@
*
*/
-// Todo:
+# Bugs
+# ----
+# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
+# Sharing all files to admin for recovery purposes still in progress
+# Possibly public links are broken (not tested since last merge of master)
+
+
+# Missing features
+# ----------------
+# Make sure user knows if large files weren't encrypted
+
+
+# Test
+# ----
+# Test that writing files works when recovery is enabled, and sharing API is disabled
+# Test trashbin support
+
+
+// Old Todo:
// - Crypt/decrypt button in the userinterface
// - Setting if crypto should be on by default
// - Add a setting "Don´t encrypt files larger than xx because of performance
// reasons"
-// - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is
-// encrypted (.encrypted extension)
-// - Don't use a password directly as encryption key. but a key which is
-// stored on the server and encrypted with the user password. -> password
-// change faster
-// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
namespace OCA\Encryption;
/**
* @brief Class for utilities relating to encrypted file storage system
- * @param OC_FilesystemView $view expected to have OC '/' as root path
+ * @param \OC_FilesystemView $view expected to have OC '/' as root path
* @param string $userId ID of the logged in user
* @param int $client indicating status of client side encryption. Currently
* unused, likely to become obsolete shortly
*/
class Util {
-
-
+
// Web UI:
-
+
//// DONE: files created via web ui are encrypted
//// DONE: file created & encrypted via web ui are readable in web ui
//// DONE: file created & encrypted via web ui are readable via webdav
-
-
+
+
// WebDAV:
-
+
//// DONE: new data filled files added via webdav get encrypted
//// DONE: new data filled files added via webdav are readable via webdav
//// DONE: reading unencrypted files when encryption is enabled works via
//// webdav
//// DONE: files created & encrypted via web ui are readable via webdav
-
-
+
+
// Legacy support:
-
+
//// DONE: add method to check if file is encrypted using new system
//// DONE: add method to check if file is encrypted using old system
//// DONE: add method to fetch legacy key
//// DONE: add method to decrypt legacy encrypted data
-
-
+
+
// Admin UI:
-
+
//// DONE: changing user password also changes encryption passphrase
-
+
//// TODO: add support for optional recovery in case of lost passphrase / keys
//// TODO: add admin optional required long passphrase for users
- //// TODO: add UI buttons for encrypt / decrypt everything
//// TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
-
-
- // Sharing:
-
- //// TODO: add support for encrypting to multiple public keys
- //// TODO: add support for decrypting to multiple private keys
-
-
+
+
// Integration testing:
-
+
//// TODO: test new encryption with versioning
- //// TODO: test new encryption with sharing
+ //// DONE: test new encryption with sharing
//// TODO: test new encryption with proxies
-
-
+
+
private $view; // OC_FilesystemView object for filesystem operations
private $userId; // ID of the currently logged-in user
private $pwd; // User Password
@@ -103,166 +107,322 @@ class Util {
private $shareKeysPath; // Dir containing env keys for shared files
private $publicKeyPath; // Path to user's public key
private $privateKeyPath; // Path to user's private key
+ private $publicShareKeyId;
+ private $recoveryKeyId;
+ private $isPublic;
+
+ /**
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @param bool $client
+ */
+ public function __construct(\OC_FilesystemView $view, $userId, $client = false) {
- public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
-
$this->view = $view;
$this->userId = $userId;
$this->client = $client;
- $this->userDir = '/' . $this->userId;
- $this->userFilesDir = '/' . $this->userId . '/' . 'files';
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-
+ $this->isPublic = false;
+
+ $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+ $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // if we are anonymous/public
+ if (\OCA\Encryption\Helper::isPublicAccess()) {
+ $this->userId = $this->publicShareKeyId;
+
+ // only handle for files_sharing app
+ if (isset($GLOBALS['app']) && $GLOBALS['app'] === 'files_sharing') {
+ $this->userDir = '/' . $GLOBALS['fileOwner'];
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/'
+ . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath =
+ $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath =
+ '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ $this->isPublic = true;
+ }
+
+ } else {
+ $this->userDir = '/' . $this->userId;
+ $this->fileFolderName = 'files';
+ $this->userFilesDir =
+ '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath =
+ $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath =
+ $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ }
}
-
+
+ /**
+ * @return bool
+ */
public function ready() {
-
- if(
- !$this->view->file_exists( $this->encryptionDir )
- or !$this->view->file_exists( $this->keyfilesPath )
- or !$this->view->file_exists( $this->shareKeysPath )
- or !$this->view->file_exists( $this->publicKeyPath )
- or !$this->view->file_exists( $this->privateKeyPath )
+
+ if (
+ !$this->view->file_exists($this->encryptionDir)
+ or !$this->view->file_exists($this->keyfilesPath)
+ or !$this->view->file_exists($this->shareKeysPath)
+ or !$this->view->file_exists($this->publicKeyPath)
+ or !$this->view->file_exists($this->privateKeyPath)
) {
-
+
return false;
-
+
} else {
-
+
return true;
-
+
}
-
+
}
-
- /**
- * @brief Sets up user folders and keys for serverside encryption
- * @param $passphrase passphrase to encrypt server-stored private key with
- */
- public function setupServerSide( $passphrase = null ) {
-
- // Create user dir
- if( !$this->view->file_exists( $this->userDir ) ) {
-
- $this->view->mkdir( $this->userDir );
-
- }
-
- // Create user files dir
- if( !$this->view->file_exists( $this->userFilesDir ) ) {
-
- $this->view->mkdir( $this->userFilesDir );
-
- }
-
- // Create shared public key directory
- if( !$this->view->file_exists( $this->publicKeyDir ) ) {
-
- $this->view->mkdir( $this->publicKeyDir );
-
- }
-
- // Create encryption app directory
- if( !$this->view->file_exists( $this->encryptionDir ) ) {
-
- $this->view->mkdir( $this->encryptionDir );
-
- }
-
- // Create mirrored keyfile directory
- if( !$this->view->file_exists( $this->keyfilesPath ) ) {
-
- $this->view->mkdir( $this->keyfilesPath );
-
- }
-
- // Create mirrored share env keys directory
- if( !$this->view->file_exists( $this->shareKeysPath ) ) {
-
- $this->view->mkdir( $this->shareKeysPath );
-
- }
-
+
+ /**
+ * @brief Sets up user folders and keys for serverside encryption
+ *
+ * @param string $passphrase to encrypt server-stored private key with
+ * @return bool
+ */
+ public function setupServerSide($passphrase = null) {
+
+ // Set directories to check / create
+ $setUpDirs = array(
+ $this->userDir,
+ $this->userFilesDir,
+ $this->publicKeyDir,
+ $this->encryptionDir,
+ $this->keyfilesPath,
+ $this->shareKeysPath
+ );
+
+ // Check / create all necessary dirs
+ foreach ($setUpDirs as $dirPath) {
+
+ if (!$this->view->file_exists($dirPath)) {
+
+ $this->view->mkdir($dirPath);
+
+ }
+
+ }
+
// Create user keypair
- if (
- ! $this->view->file_exists( $this->publicKeyPath )
- or ! $this->view->file_exists( $this->privateKeyPath )
+ // we should never override a keyfile
+ if (
+ !$this->view->file_exists($this->publicKeyPath)
+ && !$this->view->file_exists($this->privateKeyPath)
) {
-
+
// Generate keypair
$keypair = Crypt::createKeypair();
-
+
\OC_FileProxy::$enabled = false;
-
+
// Save public key
- $this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
-
+ $this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+
// Encrypt private key with user pwd as passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
-
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+
// Save private key
- $this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
-
+ $this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+
\OC_FileProxy::$enabled = true;
-
+
+ } else {
+ // check if public-key exists but private-key is missing
+ if ($this->view->file_exists($this->publicKeyPath) && !$this->view->file_exists($this->privateKeyPath)) {
+ \OCP\Util::writeLog('Encryption library',
+ 'public key exists but private key is missing for "' . $this->userId . '"', \OCP\Util::FATAL);
+ return false;
+ } else {
+ if (!$this->view->file_exists($this->publicKeyPath) && $this->view->file_exists($this->privateKeyPath)
+ ) {
+ \OCP\Util::writeLog('Encryption library',
+ 'private key exists but public key is missing for "' . $this->userId . '"', \OCP\Util::FATAL);
+ return false;
+ }
+ }
+ }
+
+ // If there's no record for this user's encryption preferences
+ if (false === $this->recoveryEnabledForUser()) {
+
+ // create database configuration
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
+ $args = array(
+ $this->userId,
+ 'server-side',
+ 0
+ );
+ $query = \OCP\DB::prepare($sql);
+ $query->execute($args);
+
}
-
+
return true;
-
+
}
-
+
+ /**
+ * @return string
+ */
+ public function getPublicShareKeyId() {
+ return $this->publicShareKeyId;
+ }
+
+ /**
+ * @brief Check whether pwd recovery is enabled for a given user
+ * @return bool 1 = yes, 0 = no, false = no record
+ *
+ * @note If records are not being returned, check for a hidden space
+ * at the start of the uid in db
+ */
+ public function recoveryEnabledForUser() {
+
+ $sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE uid = ?';
+
+ $args = array($this->userId);
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute($args);
+
+ $recoveryEnabled = array();
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $row = $result->fetchRow();
+ if (isset($row['recovery_enabled'])) {
+ $recoveryEnabled[] = $row['recovery_enabled'];
+ }
+ }
+ }
+
+ // If no record is found
+ if (empty($recoveryEnabled)) {
+
+ return false;
+
+ // If a record is found
+ } else {
+
+ return $recoveryEnabled[0];
+
+ }
+
+ }
+
+ /**
+ * @brief Enable / disable pwd recovery for a given user
+ * @param bool $enabled Whether to enable or disable recovery
+ * @return bool
+ */
+ public function setRecoveryForUser($enabled) {
+
+ $recoveryStatus = $this->recoveryEnabledForUser();
+
+ // If a record for this user already exists, update it
+ if (false === $recoveryStatus) {
+
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
+
+ $args = array(
+ $this->userId,
+ 'server-side',
+ $enabled
+ );
+
+ // Create a new record instead
+ } else {
+
+ $sql = 'UPDATE `*PREFIX*encryption` SET recovery_enabled = ? WHERE uid = ?';
+
+ $args = array(
+ $enabled,
+ $this->userId
+ );
+
+ }
+
+ $query = \OCP\DB::prepare($sql);
+
+ if ($query->execute($args)) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
/**
* @brief Find all files and their encryption status within a directory
* @param string $directory The path of the parent directory to search
+ * @param bool $found the founded files if called again
* @return mixed false if 0 found, array on success. Keys: name, path
-
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
- public function findFiles( $directory ) {
-
+ public function findEncFiles($directory, &$found = false) {
+
// Disable proxy - we don't want files to be decrypted before
// we handle them
\OC_FileProxy::$enabled = false;
-
- $found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
-
- if (
- $this->view->is_dir( $directory )
- && $handle = $this->view->opendir( $directory )
+
+ if ($found === false) {
+ $found = array(
+ 'plain' => array(),
+ 'encrypted' => array(),
+ 'legacy' => array()
+ );
+ }
+
+ if (
+ $this->view->is_dir($directory)
+ && $handle = $this->view->opendir($directory)
) {
-
- while ( false !== ( $file = readdir( $handle ) ) ) {
-
+
+ while (false !== ($file = readdir($handle))) {
+
if (
- $file != "."
- && $file != ".."
+ $file !== "."
+ && $file !== ".."
) {
-
- $filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
- $relPath = $this->stripUserFilesPath( $filePath );
-
+
+ $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+ $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
+
// If the path is a directory, search
// its contents
- if ( $this->view->is_dir( $filePath ) ) {
-
- $this->findFiles( $filePath );
-
- // If the path is a file, determine
- // its encryption status
- } elseif ( $this->view->is_file( $filePath ) ) {
-
+ if ($this->view->is_dir($filePath)) {
+
+ $this->findEncFiles($filePath, $found);
+
+ // If the path is a file, determine
+ // its encryption status
+ } elseif ($this->view->is_file($filePath)) {
+
// Disable proxies again, some-
// where they got re-enabled :/
\OC_FileProxy::$enabled = false;
-
- $data = $this->view->file_get_contents( $filePath );
-
+
+ $data = $this->view->file_get_contents($filePath);
+
// If the file is encrypted
// NOTE: If the userId is
// empty or not set, file will
@@ -270,207 +430,1118 @@ class Util {
// NOTE: This is inefficient;
// scanning every file like this
// will eat server resources :(
- if (
- Keymanager::getFileKey( $this->view, $this->userId, $file )
- && Crypt::isCatfile( $data )
+ if (
+ Keymanager::getFileKey($this->view, $this->userId, $relPath)
+ && Crypt::isCatfileContent($data)
) {
-
- $found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
-
- // If the file uses old
- // encryption system
- } elseif ( Crypt::isLegacyEncryptedContent( $this->view->file_get_contents( $filePath ), $relPath ) ) {
-
- $found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
-
- // If the file is not encrypted
+
+ $found['encrypted'][] = array(
+ 'name' => $file,
+ 'path' => $filePath
+ );
+
+ // If the file uses old
+ // encryption system
+ } elseif ( Crypt::isLegacyEncryptedContent( $data, $relPath ) ) {
+
+ $found['legacy'][] = array(
+ 'name' => $file,
+ 'path' => $filePath
+ );
+
+ // If the file is not encrypted
} else {
-
- $found['plain'][] = array( 'name' => $file, 'path' => $filePath );
-
+
+ $found['plain'][] = array(
+ 'name' => $file,
+ 'path' => $relPath
+ );
+
}
-
+
}
-
+
}
-
+
}
-
+
\OC_FileProxy::$enabled = true;
-
- if ( empty( $found ) ) {
-
+
+ if (empty($found)) {
+
return false;
-
+
} else {
-
+
return $found;
-
+
}
-
+
}
-
+
\OC_FileProxy::$enabled = true;
-
+
return false;
}
-
- /**
- * @brief Check if a given path identifies an encrypted file
- * @return true / false
- */
- public function isEncryptedPath( $path ) {
-
- // Disable encryption proxy so data retreived is in its
- // original form
- \OC_FileProxy::$enabled = false;
-
- $data = $this->view->file_get_contents( $path );
-
- \OC_FileProxy::$enabled = true;
-
- return Crypt::isCatfile( $data );
-
- }
-
+
/**
- * @brief Format a path to be relative to the /user/files/ directory
+ * @brief Fetch the last lines of a file efficiently
+ * @note Safe to use on large files; does not read entire file to memory
+ * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
*/
- public function stripUserFilesPath( $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 2 );
- $relPath = implode( '/', $sliced );
-
- return $relPath;
-
+ public function tail($filename, $numLines) {
+
+ \OC_FileProxy::$enabled = false;
+
+ $text = '';
+ $pos = -1;
+ $handle = $this->view->fopen($filename, 'r');
+
+ while ($numLines > 0) {
+
+ --$pos;
+
+ if (fseek($handle, $pos, SEEK_END) !== 0) {
+
+ rewind($handle);
+ $numLines = 0;
+
+ } elseif (fgetc($handle) === "\n") {
+
+ --$numLines;
+
+ }
+
+ $block_size = (-$pos) % 8192;
+ if ($block_size === 0 || $numLines === 0) {
+
+ $text = fread($handle, ($block_size === 0 ? 8192 : $block_size)) . $text;
+
+ }
+ }
+
+ fclose($handle);
+
+ \OC_FileProxy::$enabled = true;
+
+ return $text;
}
-
+
/**
- * @brief Encrypt all files in a directory
- * @param string $publicKey the public key to encrypt files with
- * @param string $dirPath the directory whose files will be encrypted
- * @note Encryption is recursive
+ * @brief Check if a given path identifies an encrypted file
+ * @param string $path
+ * @return boolean
*/
- public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
-
- if ( $found = $this->findFiles( $dirPath ) ) {
-
- // Disable proxy to prevent file being encrypted twice
- \OC_FileProxy::$enabled = false;
-
- // Encrypt unencrypted files
- foreach ( $found['plain'] as $plainFile ) {
-
- // Fetch data from file
- $plainData = $this->view->file_get_contents( $plainFile['path'] );
-
- // Encrypt data, generate catfile
- $encrypted = Crypt::keyEncryptKeyfile( $plainData, $publicKey );
-
- $relPath = $this->stripUserFilesPath( $plainFile['path'] );
-
- // Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encrypted['key'] );
-
- // Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
-
- $size = strlen( $encrypted['data'] );
-
- // Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-
- }
-
- // Encrypt legacy encrypted files
- if (
- ! empty( $legacyPassphrase )
- && ! empty( $newPassphrase )
- ) {
-
- foreach ( $found['legacy'] as $legacyFile ) {
-
- // Fetch data from file
- $legacyData = $this->view->file_get_contents( $legacyFile['path'] );
-
- // Recrypt data, generate catfile
- $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase );
-
- $relPath = $this->stripUserFilesPath( $legacyFile['path'] );
-
- // Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['key'] );
-
- // Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $legacyFile['path'], $recrypted['data'] );
-
- $size = strlen( $recrypted['data'] );
-
- // Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $legacyFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-
- }
-
- }
-
- \OC_FileProxy::$enabled = true;
-
- // If files were found, return true
- return true;
-
- } else {
-
- // If no files were found, return false
- return false;
-
+ public function isEncryptedPath($path) {
+
+ // Disable encryption proxy so data retrieved is in its
+ // original form
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // we only need 24 byte from the last chunk
+ $data = '';
+ $handle = $this->view->fopen($path, 'r');
+ if (is_resource($handle) && !fseek($handle, -24, SEEK_END)) {
+ $data = fgets($handle);
}
-
+
+ // re-enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return Crypt::isCatfileContent($data);
+
}
-
+
/**
- * @brief Return important encryption related paths
- * @param string $pathName Name of the directory to return the path of
- * @return string path
+ * @brief get the file size of the unencrypted file
+ * @param string $path absolute path
+ * @return bool
*/
- public function getPath( $pathName ) {
-
- switch ( $pathName ) {
-
- case 'publicKeyDir':
-
+ public function getFileSize($path) {
+
+ $result = 0;
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // split the path parts
+ $pathParts = explode('/', $path);
+
+ // get relative path
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ if (isset($pathParts[2]) && $pathParts[2] === 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
+
+ // get the size from filesystem
+ $fullPath = $this->view->getLocalFile($path);
+ $size = filesize($fullPath);
+
+ // calculate last chunk nr
+ $lastChunkNr = floor($size / 8192);
+
+ // open stream
+ $stream = fopen('crypt://' . $relativePath, "r");
+
+ if (is_resource($stream)) {
+ // calculate last chunk position
+ $lastChunckPos = ($lastChunkNr * 8192);
+
+ // seek to end
+ fseek($stream, $lastChunckPos);
+
+ // get the content of the last chunk
+ $lastChunkContent = fread($stream, 8192);
+
+ // calc the real file size with the size of the last chunk
+ $realSize = (($lastChunkNr * 6126) + strlen($lastChunkContent));
+
+ // store file size
+ $result = $realSize;
+ }
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+ }
+
+ /**
+ * @brief fix the file size of the encrypted file
+ * @param string $path absolute path
+ * @return boolean true / false if file is encrypted
+ */
+ public function fixFileSize($path) {
+
+ $result = false;
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $realSize = $this->getFileSize($path);
+
+ if ($realSize > 0) {
+
+ $cached = $this->view->getFileInfo($path);
+ $cached['encrypted'] = true;
+
+ // set the size
+ $cached['unencrypted_size'] = $realSize;
+
+ // put file info
+ $this->view->putFileInfo($path, $cached);
+
+ $result = true;
+
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+ }
+
+
+ /**
+ * @param $path
+ * @return bool
+ */
+ public function isSharedPath($path) {
+
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+
+ if (isset($split[2]) && $split[2] === 'Shared') {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Encrypt all files in a directory
+ * @param string $dirPath the directory whose files will be encrypted
+ * @param null $legacyPassphrase
+ * @param null $newPassphrase
+ * @return bool
+ * @note Encryption is recursive
+ */
+ public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
+
+ if ($found = $this->findEncFiles($dirPath)) {
+
+ // Disable proxy to prevent file being encrypted twice
+ \OC_FileProxy::$enabled = false;
+
+ // Encrypt unencrypted files
+ foreach ($found['plain'] as $plainFile) {
+
+ //relative to data/<user>/file
+ $relPath = $plainFile['path'];
+
+ //relative to /data
+ $rawPath = '/'.$this->userId . '/files/' . $plainFile['path'];
+
+ // Open plain file handle for binary reading
+ $plainHandle = $this->view->fopen( $rawPath, 'rb' );
+
+ // Open enc file handle for binary writing, with same filename as original plain file
+ $encHandle = fopen( 'crypt://' . $relPath.'.tmp', 'wb' );
+
+ // Move plain file to a temporary location
+ $size = stream_copy_to_stream( $plainHandle, $encHandle );
+
+ fclose($encHandle);
+
+ $fakeRoot = $this->view->getRoot();
+ $this->view->chroot('/'.$this->userId.'/files');
+
+ $this->view->rename($relPath . '.tmp', $relPath);
+
+ $this->view->chroot($fakeRoot);
+
+ // Add the file to the cache
+ \OC\Files\Filesystem::putFileInfo( $relPath, array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
+ }
+
+ // Encrypt legacy encrypted files
+ if (
+ !empty($legacyPassphrase)
+ && !empty($newPassphrase)
+ ) {
+
+ foreach ($found['legacy'] as $legacyFile) {
+
+ // Fetch data from file
+ $legacyData = $this->view->file_get_contents($legacyFile['path']);
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // if file exists try to get sharing users
+ if ($this->view->file_exists($legacyFile['path'])) {
+ $uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
+ } else {
+ $uniqueUserIds[] = $this->userId;
+ }
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
+
+ // Recrypt data, generate catfile
+ $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys );
+
+ $rawPath = $legacyFile['path'];
+ $relPath = \OCA\Encryption\Helper::stripUserFilesPath($rawPath);
+
+ // Save keyfile
+ Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
+
+ // Save sharekeys to user folders
+ Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
+
+ // Overwrite the existing file with the encrypted one
+ $this->view->file_put_contents($rawPath, $recrypted['data']);
+
+ $size = strlen($recrypted['data']);
+
+ // Add the file to the cache
+ \OC\Files\Filesystem::putFileInfo($rawPath, array(
+ 'encrypted' => true,
+ 'size' => $size
+ ), '');
+ }
+ }
+
+ \OC_FileProxy::$enabled = true;
+
+ // If files were found, return true
+ return true;
+ } else {
+
+ // If no files were found, return false
+ return false;
+ }
+ }
+
+ /**
+ * @brief Return important encryption related paths
+ * @param string $pathName Name of the directory to return the path of
+ * @return string path
+ */
+ public function getPath($pathName) {
+
+ switch ($pathName) {
+
+ case 'publicKeyDir':
+
return $this->publicKeyDir;
-
+
break;
-
+
case 'encryptionDir':
-
+
return $this->encryptionDir;
-
+
break;
-
+
case 'keyfilesPath':
-
+
return $this->keyfilesPath;
-
+
break;
-
+
case 'publicKeyPath':
-
+
return $this->publicKeyPath;
-
+
break;
-
+
case 'privateKeyPath':
-
+
return $this->privateKeyPath;
-
+
break;
-
}
-
+
+ return false;
+
+ }
+
+ /**
+ * @brief get path of a file.
+ * @param int $fileId id of the file
+ * @return string path of the file
+ */
+ public static function fileIdToPath($fileId) {
+
+ $sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute(array($fileId));
+
+ $path = false;
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $row = $result->fetchRow();
+ $path = substr($row['path'], strlen('files'));
+ }
+ }
+
+ return $path;
+
+ }
+
+ /**
+ * @brief Filter an array of UIDs to return only ones ready for sharing
+ * @param array $unfilteredUsers users to be checked for sharing readiness
+ * @return array as multi-dimensional array. keys: ready, unready
+ */
+ public function filterShareReadyUsers($unfilteredUsers) {
+
+ // This array will collect the filtered IDs
+ $readyIds = $unreadyIds = array();
+
+ // Loop through users and create array of UIDs that need new keyfiles
+ foreach ($unfilteredUsers as $user) {
+
+ $util = new Util($this->view, $user);
+
+ // Check that the user is encryption capable, or is the
+ // public system user 'ownCloud' (for public shares)
+ if (
+ $user === $this->publicShareKeyId
+ or $user === $this->recoveryKeyId
+ or $util->ready()
+ ) {
+
+ // Construct array of ready UIDs for Keymanager{}
+ $readyIds[] = $user;
+
+ } else {
+
+ // Construct array of unready UIDs for Keymanager{}
+ $unreadyIds[] = $user;
+
+ // Log warning; we can't do necessary setup here
+ // because we don't have the user passphrase
+ \OCP\Util::writeLog('Encryption library',
+ '"' . $user . '" is not setup for encryption', \OCP\Util::WARN);
+
+ }
+
+ }
+
+ return array(
+ 'ready' => $readyIds,
+ 'unready' => $unreadyIds
+ );
+
+ }
+
+ /**
+ * @brief Decrypt a keyfile without knowing how it was encrypted
+ * @param string $filePath
+ * @param string $fileOwner
+ * @param string $privateKey
+ * @return bool|string
+ * @note Checks whether file was encrypted with openssl_seal or
+ * openssl_encrypt, and decrypts accrdingly
+ * @note This was used when 2 types of encryption for keyfiles was used,
+ * but now we've switched to exclusively using openssl_seal()
+ */
+ public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey) {
+
+ // Get the encrypted keyfile
+ // NOTE: the keyfile format depends on how it was encrypted! At
+ // this stage we don't know how it was encrypted
+ $encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
+
+ // We need to decrypt the keyfile
+ // Has the file been shared yet?
+ if (
+ $this->userId === $fileOwner
+ && !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+ ) {
+
+ // The file has no shareKey, and its keyfile must be
+ // decrypted conventionally
+ $plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
+
+
+ } else {
+
+ // The file has a shareKey and must use it for decryption
+ $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
+
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+ }
+
+ return $plainKeyfile;
+
+ }
+
+ /**
+ * @brief Encrypt keyfile to multiple users
+ * @param Session $session
+ * @param array $users list of users which should be able to access the file
+ * @param string $filePath path of the file to be shared
+ * @return bool
+ */
+ public function setSharedFileKeyfiles(Session $session, array $users, $filePath) {
+
+ // Make sure users are capable of sharing
+ $filteredUids = $this->filterShareReadyUsers($users);
+
+ // If we're attempting to share to unready users
+ if (!empty($filteredUids['unready'])) {
+
+ \OCP\Util::writeLog('Encryption library',
+ 'Sharing to these user(s) failed as they are unready for encryption:"'
+ . print_r($filteredUids['unready'], 1), \OCP\Util::WARN);
+
+ return false;
+
+ }
+
+ // Get public keys for each user, ready for generating sharekeys
+ $userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+
+ // Note proxy status then disable it
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get the current users's private key for decrypting existing keyfile
+ $privateKey = $session->getPrivateKey();
+
+ $fileOwner = \OC\Files\Filesystem::getOwner($filePath);
+
+ // Decrypt keyfile
+ $plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
+
+ // Re-enc keyfile to (additional) sharekeys
+ $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+
+ // Save the recrypted key to it's owner's keyfiles directory
+ // Save new sharekeys to all necessary user directory
+ if (
+ !Keymanager::setFileKey($this->view, $filePath, $fileOwner, $multiEncKey['data'])
+ || !Keymanager::setShareKeys($this->view, $filePath, $multiEncKey['keys'])
+ ) {
+
+ \OCP\Util::writeLog('Encryption library',
+ 'Keyfiles could not be saved for users sharing ' . $filePath, \OCP\Util::ERROR);
+
+ return false;
+
+ }
+
+ // Return proxy to original status
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return true;
+ }
+
+ /**
+ * @brief Find, sanitise and format users sharing a file
+ * @note This wraps other methods into a portable bundle
+ */
+ public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) {
+
+ // Check if key recovery is enabled
+ if (
+ \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
+ && $this->recoveryEnabledForUser()
+ ) {
+
+ $recoveryEnabled = true;
+
+ } else {
+
+ $recoveryEnabled = false;
+
+ }
+
+ // Make sure that a share key is generated for the owner too
+ list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+
+ $userIds = array();
+ if ($sharingEnabled) {
+
+ // Find out who, if anyone, is sharing the file
+ $result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true);
+ $userIds = $result['users'];
+ if ($result['public']) {
+ $userIds[] = $this->publicShareKeyId;
+ }
+
+ }
+
+ // If recovery is enabled, add the
+ // Admin UID to list of users to share to
+ if ($recoveryEnabled) {
+
+ // Find recoveryAdmin user ID
+ $recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // Add recoveryAdmin to list of users sharing
+ $userIds[] = $recoveryKeyId;
+
+ }
+
+ // add current user if given
+ if ($currentUserId !== false) {
+
+ $userIds[] = $currentUserId;
+
+ }
+
+ // Remove duplicate UIDs
+ $uniqueUserIds = array_unique($userIds);
+
+ return $uniqueUserIds;
+
+ }
+
+ /**
+ * @brief Set file migration status for user
+ * @param $status
+ * @return bool
+ */
+ public function setMigrationStatus($status) {
+
+ $sql = 'UPDATE `*PREFIX*encryption` SET migration_status = ? WHERE uid = ?';
+
+ $args = array(
+ $status,
+ $this->userId
+ );
+
+ $query = \OCP\DB::prepare($sql);
+
+ if ($query->execute($args)) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Check whether pwd recovery is enabled for a given user
+ * @return bool 1 = yes, 0 = no, false = no record
+ * @note If records are not being returned, check for a hidden space
+ * at the start of the uid in db
+ */
+ public function getMigrationStatus() {
+
+ $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE uid = ?';
+
+ $args = array($this->userId);
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute($args);
+
+ $migrationStatus = array();
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $row = $result->fetchRow();
+ if (isset($row['migration_status'])) {
+ $migrationStatus[] = $row['migration_status'];
+ }
+ }
+ }
+
+ // If no record is found
+ if (empty($migrationStatus)) {
+
+ return false;
+
+ // If a record is found
+ } else {
+
+ return $migrationStatus[0];
+
+ }
+
+ }
+
+ /**
+ * @brief get uid of the owners of the file and the path to the file
+ * @param string $path Path of the file to check
+ * @throws \Exception
+ * @note $shareFilePath must be relative to data/UID/files. Files
+ * relative to /Shared are also acceptable
+ * @return array
+ */
+ public function getUidAndFilename($path) {
+
+ $view = new \OC\Files\View($this->userFilesDir);
+ $fileOwnerUid = $view->getOwner($path);
+
+ // handle public access
+ if ($this->isPublic) {
+ $filename = $path;
+ $fileOwnerUid = $GLOBALS['fileOwner'];
+
+ return array(
+ $fileOwnerUid,
+ $filename
+ );
+ } else {
+
+ // Check that UID is valid
+ if (!\OCP\User::userExists($fileOwnerUid)) {
+ throw new \Exception(
+ 'Could not find owner (UID = "' . var_export($fileOwnerUid, 1) . '") of file "' . $path . '"');
+ }
+
+ // NOTE: Bah, this dependency should be elsewhere
+ \OC\Files\Filesystem::initMountPoints($fileOwnerUid);
+
+ // If the file owner is the currently logged in user
+ if ($fileOwnerUid === $this->userId) {
+
+ // Assume the path supplied is correct
+ $filename = $path;
+
+ } else {
+
+ $info = $view->getFileInfo($path);
+ $ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
+
+ // Fetch real file path from DB
+ $filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
+
+ }
+
+ return array(
+ $fileOwnerUid,
+ $filename
+ );
+ }
+
+
+ }
+
+ /**
+ * @brief go recursively through a dir and collect all files and sub files.
+ * @param string $dir relative to the users files folder
+ * @return array with list of files relative to the users files folder
+ */
+ public function getAllFiles($dir) {
+
+ $result = array();
+
+ $content = $this->view->getDirectoryContent(\OC\Files\Filesystem::normalizePath($this->userFilesDir . '/' . $dir));
+
+ // handling for re shared folders
+ $pathSplit = explode('/', $dir);
+
+ foreach ($content as $c) {
+
+ $sharedPart = $pathSplit[sizeof($pathSplit) - 1];
+ $targetPathSplit = array_reverse(explode('/', $c['path']));
+
+ $path = '';
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+
+ if ($pathPart !== $sharedPart) {
+
+ $path = '/' . $pathPart . $path;
+
+ } else {
+
+ break;
+
+ }
+
+ }
+
+ $path = $dir . $path;
+
+ if ($c['type'] === 'dir') {
+
+ $result = array_merge($result, $this->getAllFiles($path));
+
+ } else {
+
+ $result[] = $path;
+
+ }
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * @brief get shares parent.
+ * @param int $id of the current share
+ * @return array of the parent
+ */
+ public static function getShareParent($id) {
+
+ $sql = 'SELECT `file_target`, `item_type` FROM `*PREFIX*share` WHERE `id` = ?';
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute(array($id));
+
+ $row = array();
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $row = $result->fetchRow();
+ }
+ }
+
+ return $row;
+
+ }
+
+ /**
+ * @brief get shares parent.
+ * @param int $id of the current share
+ * @return array of the parent
+ */
+ public static function getParentFromShare($id) {
+
+ $sql = 'SELECT `parent` FROM `*PREFIX*share` WHERE `id` = ?';
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute(array($id));
+
+ $row = array();
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $row = $result->fetchRow();
+ }
+ }
+
+ return $row;
+
+ }
+
+ /**
+ * @brief get owner of the shared files.
+ * @param $id
+ * @internal param int $Id of a share
+ * @return string owner
+ */
+ public function getOwnerFromSharedFile($id) {
+
+ $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+
+ $result = $query->execute(array($id));
+
+ $source = array();
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $source = $result->fetchRow();
+ }
+ }
+
+ $fileOwner = false;
+
+ if (isset($source['parent'])) {
+
+ $parent = $source['parent'];
+
+ while (isset($parent)) {
+
+ $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+
+ $result = $query->execute(array($parent));
+
+ $item = array();
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if($result->numRows() > 0) {
+ $item = $result->fetchRow();
+ }
+ }
+
+ if (isset($item['parent'])) {
+
+ $parent = $item['parent'];
+
+ } else {
+
+ $fileOwner = $item['uid_owner'];
+
+ break;
+
+ }
+ }
+
+ } else {
+
+ $fileOwner = $source['uid_owner'];
+
+ }
+
+ return $fileOwner;
+
+ }
+
+ /**
+ * @return string
+ */
+ public function getUserId() {
+ return $this->userId;
+ }
+
+ /**
+ * @return string
+ */
+ public function getUserFilesDir() {
+ return $this->userFilesDir;
+ }
+
+ /**
+ * @param $password
+ * @return bool
+ */
+ public function checkRecoveryPassword($password) {
+
+ $pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
+ $pathControlData = '/control-file/controlfile.enc';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $recoveryKey = $this->view->file_get_contents($pathKey);
+
+ $decryptedRecoveryKey = Crypt::symmetricDecryptFileContent($recoveryKey, $password);
+
+ $controlData = $this->view->file_get_contents($pathControlData);
+ $decryptedControlData = Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if ($decryptedControlData === 'ownCloud') {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * @return string
+ */
+ public function getRecoveryKeyId() {
+ return $this->recoveryKeyId;
+ }
+
+ /**
+ * @brief add recovery key to all encrypted files
+ */
+ public function addRecoveryKeys($path = '/') {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+ foreach ($dirContent as $item) {
+ // get relative path from files_encryption/keyfiles/
+ $filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+ if ($item['type'] === 'dir') {
+ $this->addRecoveryKeys($filePath . '/');
+ } else {
+ $session = new \OCA\Encryption\Session(new \OC_FilesystemView('/'));
+ $sharingEnabled = \OCP\Share::isEnabled();
+ // remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+ $file = substr($filePath, 0, -4);
+ $usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
+ $this->setSharedFileKeyfiles($session, $usersSharing, $file);
+ }
+ }
+ }
+
+ /**
+ * @brief remove recovery key to all encrypted files
+ */
+ public function removeRecoveryKeys($path = '/') {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+ foreach ($dirContent as $item) {
+ // get relative path from files_encryption/keyfiles
+ $filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+ if ($item['type'] === 'dir') {
+ $this->removeRecoveryKeys($filePath . '/');
+ } else {
+ // remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+ $file = substr($filePath, 0, -4);
+ $this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
+ }
+ }
+ }
+
+ /**
+ * @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
+ * @param string $file
+ * @param string $privateKey recovery key to decrypt the file
+ */
+ private function recoverFile($file, $privateKey) {
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // Find out who, if anyone, is sharing the file
+ if ($sharingEnabled) {
+ $result = \OCP\Share::getUsersSharingFile($file, $this->userId, true);
+ $userIds = $result['users'];
+ $userIds[] = $this->recoveryKeyId;
+ if ($result['public']) {
+ $userIds[] = $this->publicShareKeyId;
+ }
+ } else {
+ $userIds = array(
+ $this->userId,
+ $this->recoveryKeyId
+ );
+ }
+ $filteredUids = $this->filterShareReadyUsers($userIds);
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //decrypt file key
+ $encKeyfile = $this->view->file_get_contents($this->keyfilesPath . $file . ".key");
+ $shareKey = $this->view->file_get_contents(
+ $this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey");
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+ // encrypt file key again to all users, this time with the new public key for the recovered use
+ $userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+ $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+
+ // write new keys to filesystem TDOO!
+ $this->view->file_put_contents($this->keyfilesPath . $file . '.key', $multiEncKey['data']);
+ foreach ($multiEncKey['keys'] as $userId => $shareKey) {
+ $shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
+ $this->view->file_put_contents($shareKeyPath, $shareKey);
+ }
+
+ // Return proxy to original status
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ /**
+ * @brief collect all files and recover them one by one
+ * @param string $path to look for files keys
+ * @param string $privateKey private recovery key which is used to decrypt the files
+ */
+ private function recoverAllFiles($path, $privateKey) {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+ foreach ($dirContent as $item) {
+ // get relative path from files_encryption/keyfiles
+ $filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+ if ($item['type'] === 'dir') {
+ $this->recoverAllFiles($filePath . '/', $privateKey);
+ } else {
+ // remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+ $file = substr($filePath, 0, -4);
+ $this->recoverFile($file, $privateKey);
+ }
+ }
+ }
+
+ /**
+ * @brief recover users files in case of password lost
+ * @param string $recoveryPassword
+ */
+ public function recoverUsersFiles($recoveryPassword) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = $this->view->file_get_contents(
+ '/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
+ $privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $recoveryPassword);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $this->recoverAllFiles('/', $privateKey);
+ }
+
+ /**
+ * Get the path including the storage mount point
+ * @param int $id
+ * @return string the path including the mount point like AmazonS3/folder/file.txt
+ */
+ public function getPathWithMountPoint($id) {
+ list($storage, $internalPath) = \OC\Files\Cache\Cache::getById($id);
+ $mount = \OC\Files\Filesystem::getMountByStorageId($storage);
+ $mountPoint = $mount[0]->getMountPoint();
+ $path = \OC\Files\Filesystem::normalizePath($mountPoint.'/'.$internalPath);
+
+ // reformat the path to be relative e.g. /user/files/folder becomes /folder/
+ $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+ return $relativePath;
}
}
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..5367605898262f3d66b0e83a5aa9c06859fa8182
--- /dev/null
+++ b/apps/files_encryption/settings-admin.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+\OC_Util::checkAdminUser();
+
+$tmpl = new OCP\Template('files_encryption', 'settings-admin');
+
+// Check if an adminRecovery account is enabled for recovering files after lost pwd
+$view = new OC_FilesystemView('');
+
+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+
+$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
+
+\OCP\Util::addscript('files_encryption', 'settings-admin');
+\OCP\Util::addscript('core', 'multiselect');
+
+return $tmpl->fetchPage();
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index af0273cfdc4dc4cf1a5c31f6155ff158c8b04d5b..3e96565949b95f3cd09ef29ae1703fa3b8bab76b 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -6,12 +6,23 @@
* See the COPYING-README file.
*/
-$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
+// Add CSS stylesheet
+\OC_Util::addStyle('files_encryption', 'settings-personal');
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+$tmpl = new OCP\Template('files_encryption', 'settings-personal');
-$tmpl->assign( 'blacklist', $blackList );
+$user = \OCP\USER::getUser();
+$view = new \OC_FilesystemView('/');
+$util = new \OCA\Encryption\Util($view, $user);
+
+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+\OCP\Util::addscript('files_encryption', 'settings-personal');
+\OCP\Util::addScript('settings', 'personal');
+
+$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
+$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
return $tmpl->fetchPage();
-return null;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
deleted file mode 100644
index d1260f44e9f6ef98a6702f13a9fc3fd3a2a38073..0000000000000000000000000000000000000000
--- a/apps/files_encryption/settings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-\OC_Util::checkAdminUser();
-
-$tmpl = new OCP\Template( 'files_encryption', 'settings' );
-
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
-
-$tmpl->assign( 'blacklist', $blackList );
-$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
-
-\OCP\Util::addscript( 'files_encryption', 'settings' );
-\OCP\Util::addscript( 'core', 'multiselect' );
-
-return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..18fea1845f42189f9fce958377cd5984c5e1cccb
--- /dev/null
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -0,0 +1,56 @@
+<form id="encryption">
+ <fieldset class="personalblock">
+
+ <p>
+ <strong><?php p($l->t( 'Encryption' )); ?></strong>
+ <br />
+ </p>
+ <p>
+ <?php p($l->t( "Enable encryption passwords recovery key (allow sharing to recovery key):" )); ?>
+ <br />
+ <br />
+ <input type="password" name="recoveryPassword" id="recoveryPassword" />
+ <label for="recoveryPassword"><?php p($l->t( "Recovery account password" )); ?></label>
+ <br />
+ <input
+ type='radio'
+ name='adminEnableRecovery'
+ value='1'
+ <?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : 'disabled' ); ?> />
+ <?php p($l->t( "Enabled" )); ?>
+ <br />
+
+ <input
+ type='radio'
+ name='adminEnableRecovery'
+ value='0'
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : 'disabled' ); ?> />
+ <?php p($l->t( "Disabled" )); ?>
+ </p>
+ <br /><br />
+ <p>
+ <strong><?php p($l->t( "Change encryption passwords recovery key:" )); ?></strong>
+ <br /><br />
+ <input
+ type="password"
+ name="changeRecoveryPassword"
+ id="oldRecoveryPassword"
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
+ <label for="oldRecoveryPassword"><?php p($l->t( "Old Recovery account password" )); ?></label>
+ <br />
+ <input
+ type="password"
+ name="changeRecoveryPassword"
+ id="newRecoveryPassword"
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
+ <label for="newRecoveryPassword"><?php p($l->t( "New Recovery account password" )); ?></label>
+ <br />
+ <button
+ type="button"
+ name="submitChangeRecoveryKey"
+ disabled><?php p($l->t( "Change Password" )); ?>
+ </button>
+ <span class="msg"></span>
+ </p>
+ </fieldset>
+</form>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 5f0accaed5fd960c3c6a2a08b3493f483148b841..04d6e79179ea219190ced54d76f0321ca096d1d2 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,22 +1,33 @@
<form id="encryption">
<fieldset class="personalblock">
<legend>
- <?php p($l->t( 'Encryption' )); ?>
+ <?php p( $l->t( 'Encryption' ) ); ?>
</legend>
- <p>
- <?php p($l->t( 'File encryption is enabled.' )); ?>
- </p>
- <?php if ( ! empty( $_["blacklist"] ) ): ?>
- <p>
- <?php p($l->t( 'The following file types will not be encrypted:' )); ?>
- </p>
- <ul>
- <?php foreach( $_["blacklist"] as $type ): ?>
- <li>
- <?php p($type); ?>
- </li>
- <?php endforeach; ?>
- </ul>
+
+ <?php if ( $_["recoveryEnabled"] ): ?>
+ <p>
+ <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with your administrator:" ) ); ?></label>
+ <br />
+ <em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" ) ); ?></em>
+ <br />
+ <input
+ type='radio'
+ name='userEnableRecovery'
+ value='1'
+ <?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />
+ <?php p( $l->t( "Enabled" ) ); ?>
+ <br />
+
+ <input
+ type='radio'
+ name='userEnableRecovery'
+ value='0'
+ <?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />
+ <?php p( $l->t( "Disabled" ) ); ?>
+ <div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>
+ <div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>
+ </p>
<?php endif; ?>
+ <br />
</fieldset>
</form>
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
deleted file mode 100644
index b873d7f5aafd8e081088de28b8ad009aabcc5a56..0000000000000000000000000000000000000000
--- a/apps/files_encryption/templates/settings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<form id="encryption">
- <fieldset class="personalblock">
-
- <p>
- <strong><?php p($l->t( 'Encryption' )); ?></strong>
-
- <?php p($l->t( "Exclude the following file types from encryption:" )); ?>
- <br />
-
- <select
- id='encryption_blacklist'
- title="<?php p($l->t( 'None' ))?>"
- multiple="multiple">
- <?php foreach($_["blacklist"] as $type): ?>
- <option selected="selected" value="<?php p($type); ?>"> <?php p($type); ?> </option>
- <?php endforeach;?>
- </select>
- </p>
- </fieldset>
-</form>
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
deleted file mode 100755
index aa87ec328211bd936b922ae7ed3b0daa45594f68..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/crypt.php
+++ /dev/null
@@ -1,667 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
- * Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-use OCA\Encryption;
-
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
-
-/**
- * @note It would be better to use Mockery here for mocking out the session
- * handling process, and isolate calls to session class and data from the unit
- * tests relating to them (stream etc.). However getting mockery to work and
- * overload classes whilst also using the OC autoloader is difficult due to
- * load order Pear errors.
- */
-
-class Test_Crypt extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- // set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->dataShort = 'hats';
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
- $this->randomKey = Encryption\Crypt::generateKey();
-
- $keypair = Encryption\Crypt::createKeypair();
- $this->genPublicKey = $keypair['publicKey'];
- $this->genPrivateKey = $keypair['privateKey'];
-
- $this->view = new \OC_FilesystemView( '/' );
-
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
-
- \OC_Filesystem::init( '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-
- }
-
- function tearDown() {
-
- }
-
- function testGenerateKey() {
-
- # TODO: use more accurate (larger) string length for test confirmation
-
- $key = Encryption\Crypt::generateKey();
-
- $this->assertTrue( strlen( $key ) > 16 );
-
- }
-
- function testGenerateIv() {
-
- $iv = Encryption\Crypt::generateIv();
-
- $this->assertEquals( 16, strlen( $iv ) );
-
- return $iv;
-
- }
-
- /**
- * @depends testGenerateIv
- */
- function testConcatIv( $iv ) {
-
- $catFile = Encryption\Crypt::concatIv( $this->dataLong, $iv );
-
- // Fetch encryption metadata from end of file
- $meta = substr( $catFile, -22 );
-
- $identifier = substr( $meta, 0, 6);
-
- // Fetch IV from end of file
- $foundIv = substr( $meta, 6 );
-
- $this->assertEquals( '00iv00', $identifier );
-
- $this->assertEquals( $iv, $foundIv );
-
- // Remove IV and IV identifier text to expose encrypted content
- $data = substr( $catFile, 0, -22 );
-
- $this->assertEquals( $this->dataLong, $data );
-
- return array(
- 'iv' => $iv
- , 'catfile' => $catFile
- );
-
- }
-
- /**
- * @depends testConcatIv
- */
- function testSplitIv( $testConcatIv ) {
-
- // Split catfile into components
- $splitCatfile = Encryption\Crypt::splitIv( $testConcatIv['catfile'] );
-
- // Check that original IV and split IV match
- $this->assertEquals( $testConcatIv['iv'], $splitCatfile['iv'] );
-
- // Check that original data and split data match
- $this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
-
- }
-
- function testAddPadding() {
-
- $padded = Encryption\Crypt::addPadding( $this->dataLong );
-
- $padding = substr( $padded, -2 );
-
- $this->assertEquals( 'xx' , $padding );
-
- return $padded;
-
- }
-
- /**
- * @depends testAddPadding
- */
- function testRemovePadding( $padded ) {
-
- $noPadding = Encryption\Crypt::RemovePadding( $padded );
-
- $this->assertEquals( $this->dataLong, $noPadding );
-
- }
-
- function testEncrypt() {
-
- $random = openssl_random_pseudo_bytes( 13 );
-
- $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
-
- $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-
- $this->assertNotEquals( $this->dataUrl, $crypted );
-
- }
-
- function testDecrypt() {
-
- $random = openssl_random_pseudo_bytes( 13 );
-
- $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
-
- $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-
- $decrypt = Encryption\Crypt::decrypt( $crypted, $iv, 'hat' );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testSymmetricEncryptFileContent() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContent( $this->dataShort, 'hat' );
-
- $this->assertNotEquals( $this->dataShort, $crypted );
-
-
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted, 'hat' );
-
- $this->assertEquals( $this->dataShort, $decrypt );
-
- }
-
- // These aren't used for now
-// function testSymmetricBlockEncryptShortFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataShort, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataShort, $decrypt );
-//
-// }
-//
-// function testSymmetricBlockEncryptLongFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataLong, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypt );
-//
-// }
-
- function testSymmetricStreamEncryptShortFileContent() {
-
- $filename = 'tmp-'.time();
-
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- // Check that the file was encrypted before being written to disk
- $this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
-
- // Get private key
- $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-
-
- // Get keyfile
- $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-
- $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-
-
- // Manually decrypt
- $manualDecrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $retreivedCryptedFile, $decryptedKeyfile );
-
- // Check that decrypted data matches
- $this->assertEquals( $this->dataShort, $manualDecrypt );
-
- }
-
- /**
- * @brief Test that data that is written by the crypto stream wrapper
- * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
- * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
- * reassembly of its data
- */
- function testSymmetricStreamEncryptLongFileContent() {
-
- // Generate a a random filename
- $filename = 'tmp-'.time();
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
-// echo "\n\n\$retreivedCryptedFile = $retreivedCryptedFile\n\n";
-
- // Check that the file was encrypted before being written to disk
- $this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
-
- // Manuallly split saved file into separate IVs and encrypted chunks
- $r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
-
- //print_r($r);
-
- // Join IVs and their respective data chunks
- $e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
-
- //print_r($e);
-
-
- // Get private key
- $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-
-
- // Get keyfile
- $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-
- $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-
-
- // Set var for reassembling decrypted content
- $decrypt = '';
-
- // Manually decrypt chunk
- foreach ($e as $e) {
-
-// echo "\n\$e = $e";
-
- $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $decryptedKeyfile );
-
- // Assemble decrypted chunks
- $decrypt .= $chunkDecrypt;
-
-// echo "\n\$chunkDecrypt = $chunkDecrypt";
-
- }
-
-// echo "\n\$decrypt = $decrypt";
-
- $this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
-
- // Teardown
-
- $this->view->unlink( $filename );
-
- Encryption\Keymanager::deleteFileKey( $filename );
-
- }
-
- /**
- * @brief Test that data that is read by the crypto stream wrapper
- */
- function testSymmetricStreamDecryptShortFileContent() {
-
- $filename = 'tmp-'.time();
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- $decrypt = file_get_contents( 'crypt://' . $filename );
-
- $this->assertEquals( $this->dataShort, $decrypt );
-
- }
-
- function testSymmetricStreamDecryptLongFileContent() {
-
- $filename = 'tmp-'.time();
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- $decrypt = file_get_contents( 'crypt://' . $filename );
-
- $this->assertEquals( $this->dataLong, $decrypt );
-
- }
-
- // Is this test still necessary?
-// function testSymmetricBlockStreamDecryptFileContent() {
-//
-// \OC_User::setUserId( 'admin' );
-//
-// // Disable encryption proxy to prevent unwanted en/decryption
-// \OC_FileProxy::$enabled = false;
-//
-// $cryptedFile = file_put_contents( 'crypt://' . '/blockEncrypt', $this->dataUrl );
-//
-// // Disable encryption proxy to prevent unwanted en/decryption
-// \OC_FileProxy::$enabled = false;
-//
-// echo "\n\n\$cryptedFile = " . $this->view->file_get_contents( '/blockEncrypt' );
-//
-// $retreivedCryptedFile = file_get_contents( 'crypt://' . '/blockEncrypt' );
-//
-// $this->assertEquals( $this->dataUrl, $retreivedCryptedFile );
-//
-// \OC_FileProxy::$enabled = false;
-//
-// }
-
- function testSymmetricEncryptFileContentKeyfile() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-
- $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-
-
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted['encrypted'], $crypted['key'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testIsEncryptedContent() {
-
- $this->assertFalse( Encryption\Crypt::isCatfile( $this->dataUrl ) );
-
- $this->assertFalse( Encryption\Crypt::isCatfile( $this->legacyEncryptedData ) );
-
- $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
-
- $this->assertTrue( Encryption\Crypt::isCatfile( $keyfileContent ) );
-
- }
-
- function testMultiKeyEncrypt() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $pair1 = Encryption\Crypt::createKeypair();
-
- $this->assertEquals( 2, count( $pair1 ) );
-
- $this->assertTrue( strlen( $pair1['publicKey'] ) > 1 );
-
- $this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
-
-
- $crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataUrl, array( $pair1['publicKey'] ) );
-
- $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-
-
- $decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['encrypted'], $crypted['keys'][0], $pair1['privateKey'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testKeyEncrypt() {
-
- // Generate keypair
- $pair1 = Encryption\Crypt::createKeypair();
-
- // Encrypt data
- $crypted = Encryption\Crypt::keyEncrypt( $this->dataUrl, $pair1['publicKey'] );
-
- $this->assertNotEquals( $this->dataUrl, $crypted );
-
- // Decrypt data
- $decrypt = Encryption\Crypt::keyDecrypt( $crypted, $pair1['privateKey'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- // What is the point of this test? It doesn't use keyEncryptKeyfile()
- function testKeyEncryptKeyfile() {
-
- # TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
-
- // Generate keypair
- $pair1 = Encryption\Crypt::createKeypair();
-
- // Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-
- // Encrypt keyfile
- $cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
-
- // Decrypt keyfile
- $decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
-
- // Decrypt encrypted file
- $decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
-
- $this->assertEquals( $this->dataUrl, $decryptData );
-
- }
-
- /**
- * @brief test functionality of keyEncryptKeyfile() and
- * keyDecryptKeyfile()
- */
- function testKeyDecryptKeyfile() {
-
- $encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
-
- $this->assertNotEquals( $encrypted['data'], $this->dataShort );
-
- $decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
-
- $this->assertEquals( $decrypted, $this->dataShort );
-
- }
-
-
- /**
- * @brief test encryption using legacy blowfish method
- */
- function testLegacyEncryptShort() {
-
- $crypted = Encryption\Crypt::legacyEncrypt( $this->dataShort, $this->pass );
-
- $this->assertNotEquals( $this->dataShort, $crypted );
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- return $crypted;
-
- }
-
- /**
- * @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptShort
- */
- function testLegacyDecryptShort( $crypted ) {
-
- $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-
- $this->assertEquals( $this->dataShort, $decrypted );
-
- }
-
- /**
- * @brief test encryption using legacy blowfish method
- */
- function testLegacyEncryptLong() {
-
- $crypted = Encryption\Crypt::legacyEncrypt( $this->dataLong, $this->pass );
-
- $this->assertNotEquals( $this->dataLong, $crypted );
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- return $crypted;
-
- }
-
- /**
- * @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptLong
- */
- function testLegacyDecryptLong( $crypted ) {
-
- $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-
- $this->assertEquals( $this->dataLong, $decrypted );
-
- }
-
- /**
- * @brief test generation of legacy encryption key
- * @depends testLegacyDecryptShort
- */
- function testLegacyCreateKey() {
-
- // Create encrypted key
- $encKey = Encryption\Crypt::legacyCreateKey( $this->pass );
-
- // Decrypt key
- $key = Encryption\Crypt::legacyDecrypt( $encKey, $this->pass );
-
- $this->assertTrue( is_numeric( $key ) );
-
- // Check that key is correct length
- $this->assertEquals( 20, strlen( $key ) );
-
- }
-
- /**
- * @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptLong
- */
- function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
-
- $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
-
- $this->assertNotEquals( $this->dataLong, $recrypted['data'] );
-
- return $recrypted;
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- }
-
-// function testEncryption(){
-//
-// $key=uniqid();
-// $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// $source=file_get_contents($file); //nice large text file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $chunk=substr($source,0,8192);
-// $encrypted=OC_Encryption\Crypt::encrypt($chunk,$key);
-// $this->assertEquals(strlen($chunk),strlen($encrypted));
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$chunk);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $tmpFileEncrypted=OCP\Files::tmpFile();
-// OC_Encryption\Crypt::encryptfile($file,$tmpFileEncrypted,$key);
-// $encrypted=file_get_contents($tmpFileEncrypted);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $tmpFileDecrypted=OCP\Files::tmpFile();
-// OC_Encryption\Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
-// $decrypted=file_get_contents($tmpFileDecrypted);
-// $this->assertEquals($decrypted,$source);
-//
-// $file=OC::$SERVERROOT.'/core/img/weather-clear.png';
-// $source=file_get_contents($file); //binary file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$source);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertEquals($decrypted,$source);
-//
-// }
-//
-// function testBinary(){
-// $key=uniqid();
-//
-// $file=__DIR__.'/binary';
-// $source=file_get_contents($file); //binary file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-//
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$source);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
-// $this->assertEquals($decrypted,$source);
-// }
-
-}
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/test/keymanager.php
deleted file mode 100644
index bf453fe3163b8455136fc5b501beb451ba54c251..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/keymanager.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-use OCA\Encryption;
-
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
-
-class Test_Keymanager extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- \OC_FileProxy::$enabled = false;
-
- // set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->dataShort = 'hats';
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
- $this->randomKey = Encryption\Crypt::generateKey();
-
- $keypair = Encryption\Crypt::createKeypair();
- $this->genPublicKey = $keypair['publicKey'];
- $this->genPrivateKey = $keypair['privateKey'];
-
- $this->view = new \OC_FilesystemView( '/' );
-
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
-
- \OC_Filesystem::init( '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-
- }
-
- function tearDown(){
-
- \OC_FileProxy::$enabled = true;
-
- }
-
- function testGetPrivateKey() {
-
- $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- // Will this length vary? Perhaps we should use a range instead
- $this->assertEquals( 2296, strlen( $key ) );
-
- }
-
- function testGetPublicKey() {
-
- $key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
-
- $this->assertEquals( 451, strlen( $key ) );
-
- $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
- }
-
- function testSetFileKey() {
-
- # NOTE: This cannot be tested until we are able to break out
- # of the FileSystemView data directory root
-
- $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->randomKey, 'hat' );
-
- $path = 'unittest-'.time().'txt';
-
- //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
-
- Encryption\Keymanager::setFileKey( $this->view, $path, $this->userId, $key['key'] );
-
- }
-
-// /**
-// * @depends testGetPrivateKey
-// */
-// function testGetPrivateKey_decrypt() {
-//
-// $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-//
-// # TODO: replace call to Crypt with a mock object?
-// $decrypted = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->passphrase );
-//
-// $this->assertEquals( 1704, strlen( $decrypted ) );
-//
-// $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
-//
-// }
-
- function testGetUserKeys() {
-
- $keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
-
- $this->assertEquals( 451, strlen( $keys['publicKey'] ) );
- $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
- $this->assertEquals( 2296, strlen( $keys['privateKey'] ) );
-
- }
-
- function testGetPublicKeys() {
-
- # TODO: write me
-
- }
-
- function testGetFileKey() {
-
-// Encryption\Keymanager::getFileKey( $this->view, $this->userId, $this->filePath );
-
- }
-
-}
diff --git a/apps/files_encryption/test/legacy-encrypted-text.txt b/apps/files_encryption/test/legacy-encrypted-text.txt
deleted file mode 100644
index cb5bf50550d91842c8a0bd214edf9569daeadc48..0000000000000000000000000000000000000000
Binary files a/apps/files_encryption/test/legacy-encrypted-text.txt and /dev/null differ
diff --git a/apps/files_encryption/test/stream.php b/apps/files_encryption/test/stream.php
deleted file mode 100644
index ba82ac80eabb17dc16d01dce0d61d0f042c8a1b0..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/stream.php
+++ /dev/null
@@ -1,226 +0,0 @@
-// <?php
-// /**
-// * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
-// * This file is licensed under the Affero General Public License version 3 or
-// * later.
-// * See the COPYING-README file.
-// */
-//
-// namespace OCA\Encryption;
-//
-// class Test_Stream extends \PHPUnit_Framework_TestCase {
-//
-// function setUp() {
-//
-// \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-//
-// $this->empty = '';
-//
-// $this->stream = new Stream();
-//
-// $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-// $this->dataShort = 'hats';
-//
-// $this->emptyTmpFilePath = \OCP\Files::tmpFile();
-//
-// $this->dataTmpFilePath = \OCP\Files::tmpFile();
-//
-// file_put_contents( $this->dataTmpFilePath, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est." );
-//
-// }
-//
-// function testStreamOpen() {
-//
-// $stream1 = new Stream();
-//
-// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-//
-// // Test that resource was returned successfully
-// $this->assertTrue( $handle1 );
-//
-// // Test that file has correct size
-// $this->assertEquals( 0, $stream1->size );
-//
-// // Test that path is correct
-// $this->assertEquals( $this->emptyTmpFilePath, $stream1->rawPath );
-//
-// $stream2 = new Stream();
-//
-// $handle2 = $stream2->stream_open( 'crypt://' . $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-//
-// // Test that protocol identifier is removed from path
-// $this->assertEquals( $this->emptyTmpFilePath, $stream2->rawPath );
-//
-// // "Stat failed error" prevents this test from executing
-// // $stream3 = new Stream();
-// //
-// // $handle3 = $stream3->stream_open( $this->dataTmpFilePath, 'r', array(), $this->empty );
-// //
-// // $this->assertEquals( 0, $stream3->size );
-//
-// }
-//
-// function testStreamWrite() {
-//
-// $stream1 = new Stream();
-//
-// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'r+b', array(), $this->empty );
-//
-// # what about the keymanager? there is no key for the newly created temporary file!
-//
-// $stream1->stream_write( $this->dataShort );
-//
-// }
-//
-// // function getStream( $id, $mode, $size ) {
-// //
-// // if ( $id === '' ) {
-// //
-// // $id = uniqid();
-// // }
-// //
-// //
-// // if ( !isset( $this->tmpFiles[$id] ) ) {
-// //
-// // // If tempfile with given name does not already exist, create it
-// //
-// // $file = OCP\Files::tmpFile();
-// //
-// // $this->tmpFiles[$id] = $file;
-// //
-// // } else {
-// //
-// // $file = $this->tmpFiles[$id];
-// //
-// // }
-// //
-// // $stream = fopen( $file, $mode );
-// //
-// // Stream::$sourceStreams[$id] = array( 'path' => 'dummy' . $id, 'stream' => $stream, 'size' => $size );
-// //
-// // return fopen( 'crypt://streams/'.$id, $mode );
-// //
-// // }
-// //
-// // function testStream( ){
-// //
-// // $stream = $this->getStream( 'test1', 'w', strlen( 'foobar' ) );
-// //
-// // fwrite( $stream, 'foobar' );
-// //
-// // fclose( $stream );
-// //
-// //
-// // $stream = $this->getStream( 'test1', 'r', strlen( 'foobar' ) );
-// //
-// // $data = fread( $stream, 6 );
-// //
-// // fclose( $stream );
-// //
-// // $this->assertEquals( 'foobar', $data );
-// //
-// //
-// // $file = OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// //
-// // $source = fopen( $file, 'r' );
-// //
-// // $target = $this->getStream( 'test2', 'w', 0 );
-// //
-// // OCP\Files::streamCopy( $source, $target );
-// //
-// // fclose( $target );
-// //
-// // fclose( $source );
-// //
-// //
-// // $stream = $this->getStream( 'test2', 'r', filesize( $file ) );
-// //
-// // $data = stream_get_contents( $stream );
-// //
-// // $original = file_get_contents( $file );
-// //
-// // $this->assertEquals( strlen( $original ), strlen( $data ) );
-// //
-// // $this->assertEquals( $original, $data );
-// //
-// // }
-//
-// }
-//
-// // class Test_CryptStream extends PHPUnit_Framework_TestCase {
-// // private $tmpFiles=array();
-// //
-// // function testStream(){
-// // $stream=$this->getStream('test1','w',strlen('foobar'));
-// // fwrite($stream,'foobar');
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test1','r',strlen('foobar'));
-// // $data=fread($stream,6);
-// // fclose($stream);
-// // $this->assertEquals('foobar',$data);
-// //
-// // $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// // $source=fopen($file,'r');
-// // $target=$this->getStream('test2','w',0);
-// // OCP\Files::streamCopy($source,$target);
-// // fclose($target);
-// // fclose($source);
-// //
-// // $stream=$this->getStream('test2','r',filesize($file));
-// // $data=stream_get_contents($stream);
-// // $original=file_get_contents($file);
-// // $this->assertEquals(strlen($original),strlen($data));
-// // $this->assertEquals($original,$data);
-// // }
-// //
-// // /**
-// // * get a cryptstream to a temporary file
-// // * @param string $id
-// // * @param string $mode
-// // * @param int size
-// // * @return resource
-// // */
-// // function getStream($id,$mode,$size){
-// // if($id===''){
-// // $id=uniqid();
-// // }
-// // if(!isset($this->tmpFiles[$id])){
-// // $file=OCP\Files::tmpFile();
-// // $this->tmpFiles[$id]=$file;
-// // }else{
-// // $file=$this->tmpFiles[$id];
-// // }
-// // $stream=fopen($file,$mode);
-// // OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
-// // return fopen('crypt://streams/'.$id,$mode);
-// // }
-// //
-// // function testBinary(){
-// // $file=__DIR__.'/binary';
-// // $source=file_get_contents($file);
-// //
-// // $stream=$this->getStream('test','w',strlen($source));
-// // fwrite($stream,$source);
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test','r',strlen($source));
-// // $data=stream_get_contents($stream);
-// // fclose($stream);
-// // $this->assertEquals(strlen($data),strlen($source));
-// // $this->assertEquals($source,$data);
-// //
-// // $file=__DIR__.'/zeros';
-// // $source=file_get_contents($file);
-// //
-// // $stream=$this->getStream('test2','w',strlen($source));
-// // fwrite($stream,$source);
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test2','r',strlen($source));
-// // $data=stream_get_contents($stream);
-// // fclose($stream);
-// // $this->assertEquals(strlen($data),strlen($source));
-// // $this->assertEquals($source,$data);
-// // }
-// // }
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
deleted file mode 100755
index 1cdeff8008df2417e7e09c6cdbbb11b9e414c065..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/util.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-// Load mockery files
-require_once 'Mockery/Loader.php';
-require_once 'Hamcrest/Hamcrest.php';
-$loader = new \Mockery\Loader;
-$loader->register();
-
-use \Mockery as m;
-use OCA\Encryption;
-
-class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-
- // set content for encrypting / decrypting in tests
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->dataShort = 'hats';
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
-
- $this->userId = 'admin';
- $this->pass = 'admin';
-
- $keypair = Encryption\Crypt::createKeypair();
-
- $this->genPublicKey = $keypair['publicKey'];
- $this->genPrivateKey = $keypair['privateKey'];
-
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-
- $this->view = new \OC_FilesystemView( '/' );
-
- $this->mockView = m::mock('OC_FilesystemView');
- $this->util = new Encryption\Util( $this->mockView, $this->userId );
-
- }
-
- function tearDown(){
-
- m::close();
-
- }
-
- /**
- * @brief test that paths set during User construction are correct
- */
- function testKeyPaths() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
- $this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
- $this->assertEquals( $this->keyfilesPath, $util->getPath( 'keyfilesPath' ) );
- $this->assertEquals( $this->publicKeyPath, $util->getPath( 'publicKeyPath' ) );
- $this->assertEquals( $this->privateKeyPath, $util->getPath( 'privateKeyPath' ) );
-
- }
-
- /**
- * @brief test setup of encryption directories when they don't yet exist
- */
- function testSetupServerSideNotSetup() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( false );
- $mockView->shouldReceive( 'mkdir' )->times(4)->andReturn( true );
- $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-
- }
-
- /**
- * @brief test setup of encryption directories when they already exist
- */
- function testSetupServerSideIsSetup() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(6)->andReturn( true );
- $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-
- }
-
- /**
- * @brief test checking whether account is ready for encryption, when it isn't ready
- */
- function testReadyNotReady() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(1)->andReturn( false );
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( false, $util->ready() );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
- /**
- * @brief test checking whether account is ready for encryption, when it is ready
- */
- function testReadyIsReady() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(3)->andReturn( true );
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->ready() );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
- function testFindFiles() {
-
-// $this->view->chroot( "/data/{$this->userId}/files" );
-
- $util = new Encryption\Util( $this->view, $this->userId );
-
- $files = $util->findFiles( '/', 'encrypted' );
-
- var_dump( $files );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
-// /**
-// * @brief test decryption using legacy blowfish method
-// * @depends testLegacyEncryptLong
-// */
-// function testLegacyKeyRecryptKeyfileDecrypt( $recrypted ) {
-//
-// $decrypted = Encryption\Crypt::keyDecryptKeyfile( $recrypted['data'], $recrypted['key'], $this->genPrivateKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypted );
-//
-// }
-
-// // Cannot use this test for now due to hidden dependencies in OC_FileCache
-// function testIsLegacyEncryptedContent() {
-//
-// $keyfileContent = OCA\Encryption\Crypt::symmetricEncryptFileContent( $this->legacyEncryptedData, 'hat' );
-//
-// $this->assertFalse( OCA\Encryption\Crypt::isLegacyEncryptedContent( $keyfileContent, '/files/admin/test.txt' ) );
-//
-// OC_FileCache::put( '/admin/files/legacy-encrypted-test.txt', $this->legacyEncryptedData );
-//
-// $this->assertTrue( OCA\Encryption\Crypt::isLegacyEncryptedContent( $this->legacyEncryptedData, '/files/admin/test.txt' ) );
-//
-// }
-
-// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// function testGetLegacyKey() {
-//
-// $c = new \OCA\Encryption\Util( $view, false );
-//
-// $bool = $c->getLegacyKey( 'admin' );
-//
-// $this->assertTrue( $bool );
-//
-// $this->assertTrue( $c->legacyKey );
-//
-// $this->assertTrue( is_int( $c->legacyKey ) );
-//
-// $this->assertTrue( strlen( $c->legacyKey ) == 20 );
-//
-// }
-
-// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// function testLegacyDecrypt() {
-//
-// $c = new OCA\Encryption\Util( $this->view, false );
-//
-// $bool = $c->getLegacyKey( 'admin' );
-//
-// $encrypted = $c->legacyEncrypt( $this->data, $c->legacyKey );
-//
-// $decrypted = $c->legacyDecrypt( $encrypted, $c->legacyKey );
-//
-// $this->assertEquals( $decrypted, $this->data );
-//
-// }
-
-}
\ No newline at end of file
diff --git a/apps/files_encryption/test/binary b/apps/files_encryption/tests/binary
similarity index 100%
rename from apps/files_encryption/test/binary
rename to apps/files_encryption/tests/binary
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
new file mode 100755
index 0000000000000000000000000000000000000000..32156eea272446d8ccae2ff0aff4cc429ec58f70
--- /dev/null
+++ b/apps/files_encryption/tests/crypt.php
@@ -0,0 +1,809 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
+ * Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Crypt
+ */
+class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
+
+ const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ public $dataLong;
+ public $dataUrl;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $legacyEncryptedData;
+ public $genPrivateKey;
+ public $genPublicKey;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerUserHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // create test user
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
+ }
+
+ function setUp() {
+ // set user id
+ \OC_User::setUserId(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+ $this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
+ $this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
+
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->dataShort = 'hats';
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->randomKey = Encryption\Crypt::generateKey();
+
+ $keypair = Encryption\Crypt::createKeypair();
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->view = new \OC_FilesystemView('/');
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ // cleanup test user
+ \OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+ }
+
+ function testGenerateKey() {
+
+ # TODO: use more accurate (larger) string length for test confirmation
+
+ $key = Encryption\Crypt::generateKey();
+
+ $this->assertTrue(strlen($key) > 16);
+
+ }
+
+ /**
+ * @return String
+ */
+ function testGenerateIv() {
+
+ $iv = Encryption\Crypt::generateIv();
+
+ $this->assertEquals(16, strlen($iv));
+
+ return $iv;
+
+ }
+
+ /**
+ * @depends testGenerateIv
+ */
+ function testConcatIv($iv) {
+
+ $catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
+
+ // Fetch encryption metadata from end of file
+ $meta = substr($catFile, -22);
+
+ $identifier = substr($meta, 0, 6);
+
+ // Fetch IV from end of file
+ $foundIv = substr($meta, 6);
+
+ $this->assertEquals('00iv00', $identifier);
+
+ $this->assertEquals($iv, $foundIv);
+
+ // Remove IV and IV identifier text to expose encrypted content
+ $data = substr($catFile, 0, -22);
+
+ $this->assertEquals($this->dataLong, $data);
+
+ return array(
+ 'iv' => $iv
+ ,
+ 'catfile' => $catFile
+ );
+
+ }
+
+ /**
+ * @depends testConcatIv
+ */
+ function testSplitIv($testConcatIv) {
+
+ // Split catfile into components
+ $splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
+
+ // Check that original IV and split IV match
+ $this->assertEquals($testConcatIv['iv'], $splitCatfile['iv']);
+
+ // Check that original data and split data match
+ $this->assertEquals($this->dataLong, $splitCatfile['encrypted']);
+
+ }
+
+ /**
+ * @return string padded
+ */
+ function testAddPadding() {
+
+ $padded = Encryption\Crypt::addPadding($this->dataLong);
+
+ $padding = substr($padded, -2);
+
+ $this->assertEquals('xx', $padding);
+
+ return $padded;
+
+ }
+
+ /**
+ * @depends testAddPadding
+ */
+ function testRemovePadding($padded) {
+
+ $noPadding = Encryption\Crypt::RemovePadding($padded);
+
+ $this->assertEquals($this->dataLong, $noPadding);
+
+ }
+
+ function testEncrypt() {
+
+ $random = openssl_random_pseudo_bytes(13);
+
+ $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+ $this->assertNotEquals($this->dataUrl, $crypted);
+
+ }
+
+ function testDecrypt() {
+
+ $random = openssl_random_pseudo_bytes(13);
+
+ $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+ $decrypt = Encryption\Crypt::decrypt($crypted, $iv, 'hat');
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ function testSymmetricEncryptFileContent() {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContent($this->dataShort, 'hat');
+
+ $this->assertNotEquals($this->dataShort, $crypted);
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted, 'hat');
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ }
+
+ function testSymmetricStreamEncryptShortFileContent() {
+
+ $filename = 'tmp-' . time() . '.test';
+
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
+
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
+
+ // get session
+ $session = new \OCA\Encryption\Session($this->view);
+
+ // get private key
+ $privateKey = $session->getPrivateKey($this->userId);
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+ // Manually decrypt
+ $manualDecrypt = Encryption\Crypt::symmetricDecryptFileContent($retreivedCryptedFile, $plainKeyfile);
+
+ // Check that decrypted data matches
+ $this->assertEquals($this->dataShort, $manualDecrypt);
+
+ // Teardown
+ $this->view->unlink($this->userId . '/files/' . $filename);
+
+ Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+ }
+
+ /**
+ * @brief Test that data that is written by the crypto stream wrapper
+ * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
+ * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
+ * reassembly of its data
+ */
+ function testSymmetricStreamEncryptLongFileContent() {
+
+ // Generate a a random filename
+ $filename = 'tmp-' . time() . '.test';
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong . $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
+
+ // Manuallly split saved file into separate IVs and encrypted chunks
+ $r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
+
+ //print_r($r);
+
+ // Join IVs and their respective data chunks
+ $e = array(
+ $r[0] . $r[1],
+ $r[2] . $r[3],
+ $r[4] . $r[5],
+ $r[6] . $r[7],
+ $r[8] . $r[9],
+ $r[10] . $r[11]
+ ); //.$r[11], $r[12].$r[13], $r[14] );
+
+ //print_r($e);
+
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
+
+ // get session
+ $session = new \OCA\Encryption\Session($this->view);
+
+ // get private key
+ $privateKey = $session->getPrivateKey($this->userId);
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+ // Set var for reassembling decrypted content
+ $decrypt = '';
+
+ // Manually decrypt chunk
+ foreach ($e as $chunk) {
+
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent($chunk, $plainKeyfile);
+
+ // Assemble decrypted chunks
+ $decrypt .= $chunkDecrypt;
+
+ }
+
+ $this->assertEquals($this->dataLong . $this->dataLong, $decrypt);
+
+ // Teardown
+
+ $this->view->unlink($this->userId . '/files/' . $filename);
+
+ Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+
+ }
+
+ /**
+ * @brief Test that data that is read by the crypto stream wrapper
+ */
+ function testSymmetricStreamDecryptShortFileContent() {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->assertTrue(Encryption\Crypt::isEncryptedMeta($filename));
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $this->view->unlink($this->userId . '/files/' . $filename);
+ }
+
+ function testSymmetricStreamDecryptLongFileContent() {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ // tear down
+ $this->view->unlink($this->userId . '/files/' . $filename);
+ }
+
+ function testSymmetricEncryptFileContentKeyfile() {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->dataUrl);
+
+ $this->assertNotEquals($this->dataUrl, $crypted['encrypted']);
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted['encrypted'], $crypted['key']);
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ function testIsEncryptedContent() {
+
+ $this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
+
+ $this->assertFalse(Encryption\Crypt::isCatfileContent($this->legacyEncryptedData));
+
+ $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent($this->dataUrl, 'hat');
+
+ $this->assertTrue(Encryption\Crypt::isCatfileContent($keyfileContent));
+
+ }
+
+ function testMultiKeyEncrypt() {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ $this->assertEquals(2, count($pair1));
+
+ $this->assertTrue(strlen($pair1['publicKey']) > 1);
+
+ $this->assertTrue(strlen($pair1['privateKey']) > 1);
+
+
+ $crypted = Encryption\Crypt::multiKeyEncrypt($this->dataShort, array($pair1['publicKey']));
+
+ $this->assertNotEquals($this->dataShort, $crypted['data']);
+
+
+ $decrypt = Encryption\Crypt::multiKeyDecrypt($crypted['data'], $crypted['keys'][0], $pair1['privateKey']);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ }
+
+ function testKeyEncrypt() {
+
+ // Generate keypair
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ // Encrypt data
+ $crypted = Encryption\Crypt::keyEncrypt($this->dataUrl, $pair1['publicKey']);
+
+ $this->assertNotEquals($this->dataUrl, $crypted);
+
+ // Decrypt data
+ $decrypt = Encryption\Crypt::keyDecrypt($crypted, $pair1['privateKey']);
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ /**
+ * @brief test encryption using legacy blowfish method
+ */
+ function testLegacyEncryptShort() {
+
+ $crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
+
+ $this->assertNotEquals($this->dataShort, $crypted);
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ return $crypted;
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptShort
+ */
+ function testLegacyDecryptShort($crypted) {
+
+ $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
+
+ $this->assertEquals($this->dataShort, $decrypted);
+
+ }
+
+ /**
+ * @brief test encryption using legacy blowfish method
+ */
+ function testLegacyEncryptLong() {
+
+ $crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
+
+ $this->assertNotEquals($this->dataLong, $crypted);
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ return $crypted;
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptLong
+ */
+ function testLegacyDecryptLong($crypted) {
+
+ $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
+
+ $this->assertEquals($this->dataLong, $decrypted);
+
+ $this->assertFalse(Encryption\Crypt::getBlowfish(''));
+ }
+
+ /**
+ * @brief test generation of legacy encryption key
+ * @depends testLegacyDecryptShort
+ */
+ function testLegacyCreateKey() {
+
+ // Create encrypted key
+ $encKey = Encryption\Crypt::legacyCreateKey($this->pass);
+
+ // Decrypt key
+ $key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
+
+ $this->assertTrue(is_numeric($key));
+
+ // Check that key is correct length
+ $this->assertEquals(20, strlen($key));
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptLong
+ */
+ function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
+
+ $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey));
+
+ $this->assertNotEquals($this->dataLong, $recrypted['data']);
+
+ return $recrypted;
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ }
+
+ function testRenameFile() {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ $newFilename = 'tmp-new-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->rename($filename, $newFilename);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFilename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ $view->unlink($newFilename);
+ }
+
+ function testMoveFileIntoFolder() {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ $newFolder = '/newfolder' . time();
+ $newFilename = 'tmp-new-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->mkdir($newFolder);
+ $view->rename($filename, $newFolder . '/' . $newFilename);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . '/' . $newFilename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ $view->unlink($newFolder);
+ }
+
+ function testMoveFolder() {
+
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ $filename = '/tmp-' . time();
+ $folder = '/folder' . time();
+
+ $view->mkdir($folder);
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $folder . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ $newFolder = '/newfolder/subfolder' . time();
+ $view->mkdir('/newfolder');
+
+ $view->rename($folder, $newFolder);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ $view->unlink($newFolder);
+ $view->unlink('/newfolder');
+ }
+
+ function testChangePassphrase() {
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ // change password
+ \OC_User::setPassword($this->userId, 'test', null);
+
+ // relogin
+ $params['uid'] = $this->userId;
+ $params['password'] = 'test';
+ OCA\Encryption\Hooks::login($params);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ // change password back
+ \OC_User::setPassword($this->userId, $this->pass);
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->unlink($filename);
+ }
+
+ function testViewFilePutAndGetContents() {
+
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFileLong = $view->file_put_contents($filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFileLong));
+
+ // Get file decrypted contents
+ $decryptLong = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataLong, $decryptLong);
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testTouchExistingFile() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $view->touch($filename);
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testTouchFile() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ $view->touch($filename);
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testFopenFile() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // Get file decrypted contents
+ $decrypt = fgets($handle);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $view->unlink($filename);
+ }
+}
diff --git a/apps/files_encryption/tests/encryption.key b/apps/files_encryption/tests/encryption.key
new file mode 100644
index 0000000000000000000000000000000000000000..4ee962145c247ee03538aa70a2ff0da216c5c51c
Binary files /dev/null and b/apps/files_encryption/tests/encryption.key differ
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..40ae1659a554518590165c337789e62e25a299e6
--- /dev/null
+++ b/apps/files_encryption/tests/keymanager.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Keymanager
+ */
+class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $randomKey;
+ public $dataShort;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // disable file proxy by default
+ \OC_FileProxy::$enabled = false;
+
+ // setup filesystem
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS('admin');
+ \OC_User::setUserId('admin');
+
+ // login admin
+ $params['uid'] = 'admin';
+ $params['password'] = 'admin';
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function setUp() {
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->dataShort = 'hats';
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->randomKey = Encryption\Crypt::generateKey();
+
+ $keypair = Encryption\Crypt::createKeypair();
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->view = new \OC_FilesystemView('/');
+
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ \OC_FileProxy::$enabled = true;
+ }
+
+ function testGetPrivateKey() {
+
+ $key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent($key, $this->pass);
+
+ $res = openssl_pkey_get_private($privateKey);
+
+ $this->assertTrue(is_resource($res));
+
+ $sslInfo = openssl_pkey_get_details($res);
+
+ $this->assertArrayHasKey('key', $sslInfo);
+
+ }
+
+ function testGetPublicKey() {
+
+ $publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
+
+ $res = openssl_pkey_get_public($publiceKey);
+
+ $this->assertTrue(is_resource($res));
+
+ $sslInfo = openssl_pkey_get_details($res);
+
+ $this->assertArrayHasKey('key', $sslInfo);
+ }
+
+ function testSetFileKey() {
+
+ # NOTE: This cannot be tested until we are able to break out
+ # of the FileSystemView data directory root
+
+ $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->randomKey, 'hat');
+
+ $file = 'unittest-' . time() . '.txt';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
+ Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // cleanup
+ $this->view->unlink('/' . $this->userId . '/files/' . $file);
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ }
+
+ function testGetUserKeys() {
+
+ $keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
+
+ $resPublic = openssl_pkey_get_public($keys['publicKey']);
+
+ $this->assertTrue(is_resource($resPublic));
+
+ $sslInfoPublic = openssl_pkey_get_details($resPublic);
+
+ $this->assertArrayHasKey('key', $sslInfoPublic);
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent($keys['privateKey'], $this->pass);
+
+ $resPrivate = openssl_pkey_get_private($privateKey);
+
+ $this->assertTrue(is_resource($resPrivate));
+
+ $sslInfoPrivate = openssl_pkey_get_details($resPrivate);
+
+ $this->assertArrayHasKey('key', $sslInfoPrivate);
+ }
+
+ function testFixPartialFilePath() {
+
+ $partFilename = 'testfile.txt.part';
+ $filename = 'testfile.txt';
+
+ $this->assertTrue(Encryption\Keymanager::isPartialFilePath($partFilename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($partFilename));
+
+ $this->assertFalse(Encryption\Keymanager::isPartialFilePath($filename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
+ }
+
+ function testRecursiveDelShareKeys() {
+
+ // generate filename
+ $filename = '/tmp-' . time() . '.txt';
+
+ // create folder structure
+ $this->view->mkdir('/admin/files/folder1');
+ $this->view->mkdir('/admin/files/folder1/subfolder');
+ $this->view->mkdir('/admin/files/folder1/subfolder/subsubfolder');
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///folder1/subfolder/subsubfolder/' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // recursive delete keys
+ Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // cleanup
+ $this->view->unlink('/admin/files/folder1');
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+}
diff --git a/apps/files_encryption/tests/legacy-encrypted-text.txt b/apps/files_encryption/tests/legacy-encrypted-text.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1f5087178cd1b4829abb3483f65322296d2235f0
--- /dev/null
+++ b/apps/files_encryption/tests/legacy-encrypted-text.txt
@@ -0,0 +1 @@
+�5���ǡi���Zg�ESl�F=����
\ No newline at end of file
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/tests/proxy.php
similarity index 98%
rename from apps/files_encryption/test/proxy.php
rename to apps/files_encryption/tests/proxy.php
index 709730f7609ca2464a1faa2c410569b50fa80c19..5a2d851ff7c1019144c132875d94ddc28506ab07 100644
--- a/apps/files_encryption/test/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -52,7 +52,7 @@
// $this->userId = 'admin';
// $this->pass = 'admin';
//
-// $this->session = new Encryption\Session();
+// $this->session = new Encryption\Session( $view ); // FIXME: Provide a $view object for use here
//
// $this->session->setPrivateKey(
// '-----BEGIN PRIVATE KEY-----
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
new file mode 100755
index 0000000000000000000000000000000000000000..816bc709f26df3a2f760152506626c16cc6b1cca
--- /dev/null
+++ b/apps/files_encryption/tests/share.php
@@ -0,0 +1,911 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Share
+ */
+class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
+
+ const TEST_ENCRYPTION_SHARE_USER1 = "test-share-user1";
+ const TEST_ENCRYPTION_SHARE_USER2 = "test-share-user2";
+ const TEST_ENCRYPTION_SHARE_USER3 = "test-share-user3";
+ const TEST_ENCRYPTION_SHARE_USER4 = "test-share-user4";
+ const TEST_ENCRYPTION_SHARE_GROUP1 = "test-share-group1";
+
+ public $stateFilesTrashbin;
+ public $filename;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // enable resharing
+ \OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+
+ // clear share hooks
+ \OC_Hook::clear('OCP\\Share');
+ \OC::registerShareHooks();
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
+ // Sharing related hooks
+ \OCA\Encryption\Helper::registerShareHooks();
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // create users
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1, true);
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, true);
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, true);
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, true);
+
+ // create group and assign users
+ \OC_Group::createGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+ \OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+ \OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+ }
+
+ function setUp() {
+ $this->dataShort = 'hats';
+ $this->view = new \OC_FilesystemView('/');
+
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
+
+ $this->filename = 'share-tmp.test';
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ // clean group
+ \OC_Group::deleteGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+
+ // cleanup users
+ \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+ \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+ \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+ \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+ }
+
+ /**
+ * @param bool $withTeardown
+ */
+ function testShareFile($withTeardown = true) {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ }
+ }
+
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFile($withTeardown = true) {
+ $this->testShareFile(false);
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // get the file info
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared/' . $this->filename);
+
+ // share the file with user2
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+ // login as user2
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared/' . $this->filename);
+
+ // check if data is the same as previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // unshare the file with user2
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+ // unshare the file with user1
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ }
+ }
+
+ /**
+ * @param bool $withTeardown
+ * @return array
+ */
+ function testShareFolder($withTeardown = true) {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // create folder structure
+ $this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+ $this->view->mkdir(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+ . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created folder
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the folder with user1
+ \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // unshare the folder with user1
+ \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+ . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+ . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ }
+
+ return $fileInfo;
+ }
+
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFolder($withTeardown = true) {
+ $fileInfoFolder1 = $this->testShareFolder(false);
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created folder
+ $fileInfoSubFolder = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared' . $this->folder1
+ . $this->subfolder);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfoSubFolder));
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file with user2
+ \OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+ // login as user2
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared' . $this->subfolder
+ . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // get the file info
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared' . $this->subfolder
+ . $this->subsubfolder . '/' . $this->filename);
+
+ // check if we have fileInfos
+ $this->assertTrue(is_array($fileInfo));
+
+ // share the file with user3
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user3 exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+ // login as user3
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '/files/Shared/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as user2
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+ // unshare the file with user3
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+ . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // unshare the folder with user2
+ \OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+ . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // unshare the folder1 with user1
+ \OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+ . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+ . $this->subsubfolder . '/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+ . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ }
+ }
+
+ function testPublicShareFile() {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+ // check if share key for public exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+ // some hacking to simulate public link
+ $GLOBALS['app'] = 'files_sharing';
+ $GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1;
+ \OC_User::setUserId(false);
+
+ // get file contents
+ $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // tear down
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ }
+
+ function testShareFileWithGroup() {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user2 and user3 exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+
+ }
+
+ function testRecoveryFile() {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // check if control file created
+ $this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if recovery password match
+ $this->assertTrue($util->checkRecoveryPassword('test123'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ // create folder structure
+ $this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+ $this->view->mkdir(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+ . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile1));
+ $this->assertTrue(is_int($cryptedFile2));
+
+ // check if share key for admin and recovery exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // disable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ // remove all recovery keys
+ $util->removeRecoveryKeys('/');
+
+ // check if share key for recovery not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ // remove all recovery keys
+ $util->addRecoveryKeys('/');
+
+ // check if share key for admin and recovery exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1);
+
+ // check if share key for recovery not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ $this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
+ $this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
+ $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
+ }
+
+ function testRecoveryForUser() {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // check if control file created
+ $this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ // create folder structure
+ $this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
+ $this->view->mkdir(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder
+ . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile1));
+ $this->assertTrue(is_int($cryptedFile2));
+
+ // check if share key for user and recovery exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // change password
+ \OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
+
+ // login as user1
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
+
+ // get file contents
+ $retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
+ $retrievedCryptedFile2 = file_get_contents(
+ 'crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile1);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile2);
+
+ // cleanup
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->filename);
+
+ // check if share key for user and recovery exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+ . $this->subfolder . $this->subsubfolder . '/'
+ . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ \OCA\Encryption\Helper::adminDisableRecovery('test123');
+ $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
+ }
+
+ function testFailShareFile() {
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // break users public key
+ $this->view->rename('/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key',
+ '/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup');
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+
+ // login as admin
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+ // check if share key for user1 not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // break user1 public key
+ $this->view->rename(
+ '/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup',
+ '/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key');
+
+ // remove share file
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3
+ . '.shareKey');
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // unshare the file with user1
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+ . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+ }
+
+}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d9787675428a879371aa481ab6d397c6d38c221
--- /dev/null
+++ b/apps/files_encryption/tests/stream.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Stream
+ * @brief this class provide basic stream tests
+ */
+class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
+
+ const TEST_ENCRYPTION_STREAM_USER1 = "test-stream-user1";
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // create test user
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
+ }
+
+ function setUp() {
+ // set user id
+ \OC_User::setUserId(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+ $this->userId = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
+ $this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ // cleanup test user
+ \OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+ }
+
+ function testStreamOptions() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // check if stream is at position zero
+ $this->assertEquals(0, ftell($handle));
+
+ // set stream options
+ $this->assertTrue(flock($handle, LOCK_SH));
+ $this->assertTrue(flock($handle, LOCK_UN));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetBlocking() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertTrue(stream_set_blocking($handle, 1));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetTimeout() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertFalse(stream_set_timeout($handle, 1));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetWriteBuffer() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertEquals(0, stream_set_write_buffer($handle, 1024));
+
+ // tear down
+ $view->unlink($filename);
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
new file mode 100755
index 0000000000000000000000000000000000000000..29f8fb5a396a597641637d03005f550243d0ff33
--- /dev/null
+++ b/apps/files_encryption/tests/trashbin.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Trashbin
+ * @brief this class provide basic trashbin app tests
+ */
+class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
+
+ const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ \OC_Hook::clear('OC_Filesystem');
+ \OC_Hook::clear('OC_User');
+
+ // trashbin hooks
+ \OCA\Files_Trashbin\Trashbin::registerHooks();
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // create test user
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1, true);
+ }
+
+ function setUp() {
+ // set user id
+ \OC_User::setUserId(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+ $this->userId = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
+ $this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we want to tests with app files_trashbin enabled
+ \OC_App::enable('files_trashbin');
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ // cleanup test user
+ \OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+ }
+
+ /**
+ * @brief test delete file
+ */
+ function testDeleteFile() {
+
+ // generate filename
+ $filename = 'tmp-' . time() . '.txt';
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+ . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+ . $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+ // delete file
+ \OC\FIles\Filesystem::unlink($filename);
+
+ // check if file not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+ . '.key'));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+ . $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+ // get files
+ $trashFiles = $this->view->getDirectoryContent(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
+
+ $trashFileSuffix = null;
+ // find created file with timestamp
+ foreach ($trashFiles as $file) {
+ if (strncmp($file['path'], $filename, strlen($filename))) {
+ $path_parts = pathinfo($file['name']);
+ $trashFileSuffix = $path_parts['extension'];
+ }
+ }
+
+ // check if we found the file we created
+ $this->assertNotNull($trashFileSuffix);
+
+ // check if key for admin not exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+ . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin not exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+ . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+
+ // return filename for next test
+ return $filename . '.' . $trashFileSuffix;
+ }
+
+ /**
+ * @brief test restore file
+ *
+ * @depends testDeleteFile
+ */
+ function testRestoreFile($filename) {
+
+ // prepare file information
+ $path_parts = pathinfo($filename);
+ $trashFileSuffix = $path_parts['extension'];
+ $timestamp = str_replace('d', '', $trashFileSuffix);
+ $fileNameWithoutSuffix = str_replace('.' . $trashFileSuffix, '', $filename);
+
+ // restore file
+ $this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
+
+ // check if file exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $fileNameWithoutSuffix));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
+ . $fileNameWithoutSuffix . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+ . $fileNameWithoutSuffix . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+ }
+
+ /**
+ * @brief test delete file forever
+ */
+ function testPermanentDeleteFile() {
+
+ // generate filename
+ $filename = 'tmp-' . time() . '.txt';
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+ . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+ . $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+ // delete file
+ \OC\FIles\Filesystem::unlink($filename);
+
+ // check if file not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+ . '.key'));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+ . $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+ // find created file with timestamp
+ $query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
+ . ' WHERE `id`=?');
+ $result = $query->execute(array($filename))->fetchRow();
+
+ $this->assertTrue(is_array($result));
+
+ // build suffix
+ $trashFileSuffix = 'd' . $result['timestamp'];
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+ . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+ . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+
+ // get timestamp from file
+ $timestamp = str_replace('d', '', $trashFileSuffix);
+
+ // delete file forever
+ $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
+ . $trashFileSuffix));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+ . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+ . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
new file mode 100755
index 0000000000000000000000000000000000000000..0dc452a41c870de813b9034d3561542202edf2ff
--- /dev/null
+++ b/apps/files_encryption/tests/util.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Util
+ */
+class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
+
+ const TEST_ENCRYPTION_UTIL_USER1 = "test-util-user1";
+ const TEST_ENCRYPTION_UTIL_LEGACY_USER = "test-legacy-user";
+
+ public $userId;
+ public $encryptionDir;
+ public $publicKeyDir;
+ public $pass;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $keyfilesPath;
+ public $publicKeyPath;
+ public $privateKeyPath;
+ /**
+ * @var \OCA\Encryption\Util
+ */
+ public $util;
+ public $dataShort;
+ public $legacyEncryptedData;
+ public $legacyEncryptedDataKey;
+ public $legacyKey;
+ public $stateFilesTrashbin;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // create test user
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, true);
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
+ }
+
+
+ function setUp() {
+ \OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+ $this->userId = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
+ $this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
+
+ // set content for encrypting / decrypting in tests
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->dataShort = 'hats';
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->legacyKey = '30943623843030686906';
+
+ $keypair = Encryption\Crypt::createKeypair();
+
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->publicKeyPath =
+ $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath =
+ $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+
+ $this->view = new \OC_FilesystemView('/');
+
+ $this->util = new Encryption\Util($this->view, $this->userId);
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ // cleanup test user
+ \OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+ \OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+ }
+
+ /**
+ * @brief test that paths set during User construction are correct
+ */
+ function testKeyPaths() {
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ $this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
+ $this->assertEquals($this->encryptionDir, $util->getPath('encryptionDir'));
+ $this->assertEquals($this->keyfilesPath, $util->getPath('keyfilesPath'));
+ $this->assertEquals($this->publicKeyPath, $util->getPath('publicKeyPath'));
+ $this->assertEquals($this->privateKeyPath, $util->getPath('privateKeyPath'));
+
+ }
+
+ /**
+ * @brief test setup of encryption directories
+ */
+ function testSetupServerSide() {
+ $this->assertEquals(true, $this->util->setupServerSide($this->pass));
+ }
+
+ /**
+ * @brief test checking whether account is ready for encryption,
+ */
+ function testUserIsReady() {
+ $this->assertEquals(true, $this->util->ready());
+ }
+
+ /**
+ * @brief test checking whether account is not ready for encryption,
+ */
+// function testUserIsNotReady() {
+// $this->view->unlink($this->publicKeyDir);
+//
+// $params['uid'] = $this->userId;
+// $params['password'] = $this->pass;
+// $this->assertFalse(OCA\Encryption\Hooks::login($params));
+//
+// $this->view->unlink($this->privateKeyPath);
+// }
+
+ /**
+ * @brief test checking whether account is not ready for encryption,
+ */
+ function testIsLegacyUser() {
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+ $userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+ $userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
+ $params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
+
+ $util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+ $util->setMigrationStatus(0);
+
+ $this->assertTrue(OCA\Encryption\Hooks::login($params));
+
+ $this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
+ }
+
+ function testRecoveryEnabledForUser() {
+
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ // Record the value so we can return it to it's original state later
+ $enabled = $util->recoveryEnabledForUser();
+
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ $this->assertEquals(1, $util->recoveryEnabledForUser());
+
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ $this->assertEquals(0, $util->recoveryEnabledForUser());
+
+ // Return the setting to it's previous state
+ $this->assertTrue($util->setRecoveryForUser($enabled));
+
+ }
+
+ function testGetUidAndFilename() {
+
+ \OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+
+ $filename = 'tmp-' . time() . '.test';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
+
+ $this->assertEquals(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
+
+ $this->assertEquals($file, $filename);
+
+ $this->view->unlink($this->userId . '/files/' . $filename);
+ }
+
+ function testIsSharedPath() {
+ $sharedPath = '/user1/files/Shared/test';
+ $path = '/user1/files/test';
+
+ $this->assertTrue($this->util->isSharedPath($sharedPath));
+
+ $this->assertFalse($this->util->isSharedPath($path));
+ }
+
+ function testEncryptLegacyFiles() {
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+ $userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+ $view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+ $userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+ $legacyEncryptedData = file_get_contents($this->legacyEncryptedData);
+ $view->mkdir('/test/');
+ $view->mkdir('/test/subtest/');
+ $view->file_put_contents('/test/subtest/legacy-encrypted-text.txt', $legacyEncryptedData);
+
+ $fileInfo = $view->getFileInfo('/test/subtest/legacy-encrypted-text.txt');
+ $fileInfo['encrypted'] = true;
+ $view->putFileInfo('/test/subtest/legacy-encrypted-text.txt', $fileInfo);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
+ $params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
+
+ $util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+ $util->setMigrationStatus(0);
+
+ $this->assertTrue(OCA\Encryption\Hooks::login($params));
+
+ $this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
+
+ $files = $util->findEncFiles('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files/');
+
+ $this->assertTrue(is_array($files));
+
+ $found = false;
+ foreach ($files['encrypted'] as $encryptedFile) {
+ if ($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
+ $found = true;
+ break;
+ }
+ }
+
+ $this->assertTrue($found);
+ }
+
+ /**
+ * @param $user
+ * @param bool $create
+ * @param bool $password
+ */
+ public static function loginHelper($user, $create = false, $password = false) {
+ if ($create) {
+ \OC_User::createUser($user, $user);
+ }
+
+ if ($password === false) {
+ $password = $user;
+ }
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($user);
+ \OC_User::setUserId($user);
+
+ $params['uid'] = $user;
+ $params['password'] = $password;
+ OCA\Encryption\Hooks::login($params);
+ }
+}
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
new file mode 100755
index 0000000000000000000000000000000000000000..1d406789f0c1ac0b1bc1aa9a4d5c8d9efbae4d5e
--- /dev/null
+++ b/apps/files_encryption/tests/webdav.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Webdav
+ * @brief this class provide basic webdav tests for PUT,GET and DELETE
+ */
+class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
+
+ const TEST_ENCRYPTION_WEBDAV_USER1 = "test-webdav-user1";
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerUserHooks();
+
+ // clear and register hooks
+ \OC_FileProxy::clearProxies();
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // create test user
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
+ }
+
+ function setUp() {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+ $this->userId = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
+ $this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // create test user
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+ }
+
+ function tearDown() {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ }
+ else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ public static function tearDownAfterClass() {
+ // cleanup test user
+ \OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+ }
+
+ /**
+ * @brief test webdav put random file
+ */
+ function testWebdavPUT() {
+
+ // generate filename
+ $filename = '/tmp-' . time() . '.txt';
+
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'OPTIONS';
+
+ $_SERVER['REQUEST_METHOD'] = 'PUT';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
+ $_SERVER['CONTENT_TYPE'] = 'application/octet-stream';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+ $_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort);
+
+ // handle webdav request
+ $this->handleWebdavRequest($this->dataShort);
+
+ // check if file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+ // check if key-file was created
+ $this->assertTrue($this->view->file_exists(
+ '/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if shareKey-file was created
+ $this->assertTrue($this->view->file_exists(
+ '/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get encrypted file content
+ $encryptedContent = $this->view->file_get_contents('/' . $this->userId . '/files' . $filename);
+
+ // restore proxy state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // check if encrypted content is valid
+ $this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
+
+ // get decrypted file contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ // check if file content match with the written content
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // return filename for next test
+ return $filename;
+ }
+
+ /**
+ * @brief test webdav get random file
+ *
+ * @depends testWebdavPUT
+ */
+ function testWebdavGET($filename) {
+
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+ // handle webdav request
+ $content = $this->handleWebdavRequest();
+
+ // check if file content match with the written content
+ $this->assertEquals($this->dataShort, $content);
+
+ // return filename for next test
+ return $filename;
+ }
+
+ /**
+ * @brief test webdav delete random file
+ * @depends testWebdavGET
+ */
+ function testWebdavDELETE($filename) {
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'DELETE';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+ // handle webdav request
+ $content = $this->handleWebdavRequest();
+
+ // check if file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+ // check if key-file was removed
+ $this->assertFalse($this->view->file_exists(
+ '/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
+
+ // check if shareKey-file was removed
+ $this->assertFalse($this->view->file_exists(
+ '/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
+ }
+
+ /**
+ * @brief handle webdav request
+ *
+ * @param bool $body
+ *
+ * @note this init procedure is copied from /apps/files/appinfo/remote.php
+ */
+ function handleWebdavRequest($body = false) {
+ // Backends
+ $authBackend = new OC_Connector_Sabre_Auth();
+ $lockBackend = new OC_Connector_Sabre_Locks();
+ $requestBackend = new OC_Connector_Sabre_Request();
+
+ // Create ownCloud Dir
+ $publicDir = new OC_Connector_Sabre_Directory('');
+
+ // Fire up server
+ $server = new Sabre_DAV_Server($publicDir);
+ $server->httpRequest = $requestBackend;
+ $server->setBaseUri('/remote.php/webdav/');
+
+ // Load plugins
+ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
+ $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
+ $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+ $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
+ $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
+
+ // And off we go!
+ if ($body) {
+ $server->httpRequest->setBody($body);
+ }
+
+ // turn on output buffering
+ ob_start();
+
+ // handle request
+ $server->exec();
+
+ // file content is written in the output buffer
+ $content = ob_get_contents();
+
+ // flush the output buffer and turn off output buffering
+ ob_end_clean();
+
+ // return captured content
+ return $content;
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/test/zeros b/apps/files_encryption/tests/zeros
similarity index 100%
rename from apps/files_encryption/test/zeros
rename to apps/files_encryption/tests/zeros
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 9bf997d87cb8d0a21a79ba115c6d2993d483549c..29c962d9a8057b2898921ce6113494c5b9b5ac76 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Klaida nustatinėjant Google Drive talpyklą",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> \"smbclient\" nėra įdiegtas. CIFS/SMB dalinimasis nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas \"smbclient\"",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> FTP palaikymas PHP sistemoje nėra įjungtas arba nėra įdiegtas. FTP dalinimosi įjungimas nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas FTP palaikymas. ",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas.",
"External Storage" => "Išorinės saugyklos",
"Folder name" => "Katalogo pavadinimas",
"External storage" => "Išorinė saugykla",
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 961ef2b1046bb8833751b47be4a337f77c761371..ea8648303d1be23bec5c75f626e4f1f5ccaf63ec 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -2,6 +2,11 @@
"Access granted" => "Tilgang innvilget",
"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
"Grant access" => "Gi tilgang",
+"Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+"Error configuring Google Drive storage" => "Feil med konfigurering av Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det.",
"External Storage" => "Ekstern lagring",
"Folder name" => "Mappenavn",
"External storage" => "Ekstern lagringsplass",
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 4b4b6167d88628cfae7ace8305001b3a06cc31b7..998c3f824578b5d2553d84eecd777aff27a8c4ff 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Configuration" => "Innstillingar",
"Groups" => "Grupper",
"Users" => "Brukarar",
"Delete" => "Slett"
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index cd1b1fe84a1f4145a50bd3ba44a5b9d7c68c11f3..e03ded1e70a222268880990d6d7fc2339755e9e4 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone. Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Wsparcie dla Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji.",
"External Storage" => "Zewnętrzna zasoby dyskowe",
"Folder name" => "Nazwa folderu",
"External storage" => "Zewnętrzne zasoby dyskowe",
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index 406e284b2781734bdcdde8fb67bf3c99845057a9..a43417dfbc1a134a783914c108680fa888d81f06 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -1,23 +1,4 @@
<?php $TRANSLATIONS = array(
-"Access granted" => "Доступ разрешен",
-"Error configuring Dropbox storage" => "Ошибка при конфигурировании хранилища Dropbox",
-"Grant access" => "Предоставить доступ",
-"Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.",
-"Error configuring Google Drive storage" => "Ошибка настройки хранилища Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.",
-"External Storage" => "Внешние системы хранения данных",
-"Folder name" => "Имя папки",
-"Configuration" => "Конфигурация",
-"Options" => "Опции",
-"Applicable" => "Применимый",
-"None set" => "Не задан",
-"All Users" => "Все пользователи",
"Groups" => "Группы",
-"Users" => "Пользователи",
-"Delete" => "Удалить",
-"Enable User External Storage" => "Включить пользовательскую внешнюю систему хранения данных",
-"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных",
-"SSL root certificates" => "Корневые сертификаты SSL",
-"Import Root Certificate" => "Импортировать корневые сертификаты"
+"Delete" => "Удалить"
);
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 655c3c9a81653b1fafad3bee8c8e6ffb9d1e4129..81a6c95638591115d7740496e313571fb35bbcf6 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -57,12 +57,22 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
public function stat($path) {
if ( ! $path and $this->root=='/') {//mtime doesn't work for shares
- $mtime=$this->shareMTime();
$stat=stat($this->constructUrl($path));
+ if (empty($stat)) {
+ return false;
+ }
+ $mtime=$this->shareMTime();
$stat['mtime']=$mtime;
return $stat;
} else {
- return stat($this->constructUrl($path));
+ $stat = stat($this->constructUrl($path));
+
+ // smb4php can return an empty array if the connection could not be established
+ if (empty($stat)) {
+ return false;
+ }
+
+ return $stat;
}
}
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index abd1ee394bc55546c67653de36306dd1058c881c..aeba545dabc1d1a634b989fbbe5274ef680e7b4e 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,6 +1,9 @@
<?php $TRANSLATIONS = array(
"Password" => "Passord",
"Submit" => "Send",
+"%s shared the folder %s with you" => "%s delte mappa %s med deg",
+"%s shared the file %s with you" => "%s delte fila %s med deg",
"Download" => "Last ned",
+"No preview available for" => "Inga førehandsvising tilgjengeleg for",
"web services under your control" => "Vev tjenester under din kontroll"
);
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
index 36e4b2fd0e1fceccc83a859368d0a7a9d6d189e2..2cadd163462aaa92e781eb415cde248d47a4d088 100644
--- a/apps/files_sharing/l10n/ru_RU.php
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -1,9 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Пароль",
-"Submit" => "Передать",
-"%s shared the folder %s with you" => "%s имеет общий с Вами доступ к папке %s ",
-"%s shared the file %s with you" => "%s имеет общий с Вами доступ к файлу %s ",
-"Download" => "Загрузка",
-"No preview available for" => "Предварительный просмотр недоступен",
-"web services under your control" => "веб-сервисы под Вашим контролем"
+"Download" => "Загрузка"
);
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index 6747faa4d4313269cbf1649774e625cbfd1f26f5..b6638564cd82c343070f6be07da1b3235d7f8747 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -70,6 +70,28 @@ class Shared_Permissions extends Permissions {
return $filePermissions;
}
+ /**
+ * get the permissions for all files in a folder
+ *
+ * @param int $parentId
+ * @param string $user
+ * @return int[]
+ */
+ public function getDirectoryPermissions($parentId, $user) {
+ // Root of the Shared folder
+ if ($parentId === -1) {
+ return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_PERMISSIONS);
+ }
+ $permissions = $this->get($parentId, $user);
+ $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `parent` = ?');
+ $result = $query->execute(array($parentId));
+ $filePermissions = array();
+ while ($row = $result->fetchRow()) {
+ $filePermissions[$row['fileid']] = $permissions;
+ }
+ return $filePermissions;
+ }
+
/**
* remove the permissions for a file
*
@@ -83,4 +105,5 @@ class Shared_Permissions extends Permissions {
public function removeMultiple($fileIds, $user) {
// Not a valid action for Shared Permissions
}
-}
+
+}
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 62948651806fdde14b0d28b67d64dcaa57567cc5..07e7a4ca0c5ccaa1c26d6acb55141abbf351b47a 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -26,6 +26,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
const FORMAT_FILE_APP_ROOT = 2;
const FORMAT_OPENDIR = 3;
const FORMAT_GET_ALL = 4;
+ const FORMAT_PERMISSIONS = 5;
private $path;
@@ -125,6 +126,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
$ids[] = $item['file_source'];
}
return $ids;
+ } else if ($format === self::FORMAT_PERMISSIONS) {
+ $filePermissions = array();
+ foreach ($items as $item) {
+ $filePermissions[$item['file_source']] = $item['permissions'];
+ }
+ return $filePermissions;
}
return array();
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 2b283375a67734e15bde3e4c811b83e486d9a1f3..98d2a84fb6658183b5e1263ff73e8f6087e8285c 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,5 +1,4 @@
<?php
-$RUNTIME_NOSETUPFS = true;
// Load other apps for file previews
OC_App::loadApps();
@@ -46,6 +45,7 @@ if (isset($_GET['t'])) {
$fileOwner = $shareOwner;
}
if (isset($fileOwner)) {
+ OC_Util::tearDownFS();
OC_Util::setupFS($fileOwner);
$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
}
@@ -84,7 +84,7 @@ if (isset($path)) {
exit();
} else {
// Save item id in session for future requests
- $_SESSION['public_link_authenticated'] = $linkItem['id'];
+ \OC::$session->set('public_link_authenticated', $linkItem['id']);
}
} else {
OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
@@ -97,8 +97,8 @@ if (isset($path)) {
} else {
// Check if item id is set in session
- if (!isset($_SESSION['public_link_authenticated'])
- || $_SESSION['public_link_authenticated'] !== $linkItem['id']
+ if ( ! \OC::$session->exists('public_link_authenticated')
+ || \OC::$session->get('public_link_authenticated') !== $linkItem['id']
) {
// Prompt for password
$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index e83d3b8fbbd766ccadf600b766452bec191e3a16..3b1e0ac30cc3e4dc802cc86e427e3f7c64d4e475 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -3,7 +3,5 @@
OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
-//Listen to delete file signal
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
-//Listen to delete user signal
-OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
\ No newline at end of file
+// register hooks
+\OCA\Files_Trashbin\Trashbin::registerHooks();
\ No newline at end of file
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index eed253d66025ecea4341ec018506505f5485ead3..691642811b74f35ba46912065e6839e71becc4d0 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -93,6 +93,7 @@ $(document).ready(function() {
});
$('.undelete').click('click',function(event) {
+ event.preventDefault();
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
@@ -117,6 +118,7 @@ $(document).ready(function() {
});
$('.delete').click('click',function(event) {
+ event.preventDefault();
console.log("delete selected");
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index e1dce4b399525bf2fb3672a8595958393b7d65b7..43ad018049447a8d0a1b6c1bcf98a031bf498680 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -13,5 +13,6 @@
"{count} files" => "{count} filer",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
"Restore" => "Gjenopprett",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Deleted Files" => "Slettet filer"
);
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 8166a024e58de6b593dc849c70ad736f466fee7b..454ea2b05753198172040752659ff7bc99149290 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,10 +1,18 @@
<?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
+"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
+"perform restore operation" => "utfør gjenoppretting",
"Error" => "Feil",
+"delete file permanently" => "slett fila for godt",
"Delete permanently" => "Slett for godt",
"Name" => "Namn",
+"Deleted" => "Sletta",
"1 folder" => "1 mappe",
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
-"Delete" => "Slett"
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
+"Restore" => "Gjenopprett",
+"Delete" => "Slett",
+"Deleted Files" => "Sletta filer"
);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 178eb531077ceb3e661ff107f9480da8b9fdb31d..8636e417ecb207808d94e78c9acc8e05d51d1266 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,18 +1,5 @@
<?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
-"Couldn't restore %s" => "%s не может быть восстановлен",
-"perform restore operation" => "выполнить операцию восстановления",
"Error" => "Ошибка",
-"delete file permanently" => "удалить файл навсегда",
-"Delete permanently" => "Удалить навсегда",
"Name" => "Имя",
-"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить",
-"Delete" => "Удалить",
-"Deleted Files" => "Удаленные файлы"
+"Delete" => "Удалить"
);
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 7fda855d0c2c2765192a73f71c85e6052da388b7..2d1830a38f1b4a8e10e575dab4cfc2b5222fdb49 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -29,6 +29,17 @@ class Trashbin {
// unit: percentage; 50% of available disk space/quota
const DEFAULTMAXSIZE=50;
+ public static function getUidAndFilename($filename) {
+ $uid = \OC\Files\Filesystem::getOwner($filename);
+ \OC\Files\Filesystem::initMountPoints($uid);
+ if ( $uid != \OCP\User::getUser() ) {
+ $info = \OC\Files\Filesystem::getFileInfo($filename);
+ $ownerView = new \OC\Files\View('/'.$uid.'/files');
+ $filename = $ownerView->getPath($info['fileid']);
+ }
+ return array($uid, $filename);
+ }
+
/**
* move file to the trash bin
*
@@ -62,8 +73,12 @@ class Trashbin {
if ( $trashbinSize === false || $trashbinSize < 0 ) {
$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
}
-
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+ \OC_FileProxy::$enabled = $proxyStatus;
if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
$trashbinSize += $sizeOfAddedFiles;
@@ -110,13 +125,17 @@ class Trashbin {
\OC_FileProxy::$enabled = false;
$user = \OCP\User::getUser();
- if ($view->is_dir('files_versions/' . $file_path)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path));
- $view->rename('files_versions/' . $file_path, 'files_trashbin/versions/' . $filename . '.d' . $timestamp);
- } else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) {
+ $rootView = new \OC\Files\View('/');
+
+ list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
+ if ($rootView->is_dir($owner.'/files_versions/' . $ownerPath)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
+ $rootView->rename($owner.'/files_versions/' . $ownerPath, $user.'/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+ } else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
foreach ($versions as $v) {
- $size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']);
- $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+ $size += $rootView->filesize($owner.'/files_versions' . $v['path'] . '.v' . $v['version']);
+ $rootView->rename($owner.'/files_versions' . $v['path'] . '.v' . $v['version'], $user.'/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
}
}
@@ -143,35 +162,38 @@ class Trashbin {
if (\OCP\App::isEnabled('files_encryption')) {
$user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
// disable proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// retain key files
- $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path);
+ $keyfile = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/keyfiles/' . $ownerPath);
- if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) {
- $user = \OCP\User::getUser();
+ if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
// move keyfiles
- if ($view->is_dir($keyfile)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
- $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+ if ($rootView->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View($keyfile));
+ $rootView->rename($keyfile, $user.'/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
} else {
- $size += $view->filesize($keyfile . '.key');
- $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+ $size += $rootView->filesize($keyfile . '.key');
+ $rootView->rename($keyfile . '.key', $user.'/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
}
}
// retain share keys
- $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path);
+ $sharekeys = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/share-keys/' . $ownerPath);
- if ($view->is_dir($sharekeys)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
- $view->rename($sharekeys, 'files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+ if ($rootView->is_dir($sharekeys)) {
+ $size += self::calculateSize(new \OC\Files\View($sharekeys));
+ $rootView->rename($sharekeys, $user.'/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
} else {
// get local path to share-keys
- $localShareKeysPath = $view->getLocalFile($sharekeys);
+ $localShareKeysPath = $rootView->getLocalFile($sharekeys);
// handle share-keys
$matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
@@ -186,10 +208,10 @@ class Trashbin {
if($pathinfo['basename'] == $ownerShareKey) {
// calculate size
- $size += $view->filesize($sharekeys. '.' . $user. '.shareKey');
+ $size += $rootView->filesize($sharekeys. '.' . $user. '.shareKey');
// move file
- $view->rename($sharekeys. '.' . $user. '.shareKey', 'files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
+ $rootView->rename($sharekeys. '.' . $user. '.shareKey', $user.'/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
} else {
// calculate size
@@ -321,6 +343,12 @@ class Trashbin {
\OC_FileProxy::$enabled = false;
$user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ $target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+ list($owner, $ownerPath) = self::getUidAndFilename($target);
+
if ($timestamp) {
$versionedFile = $filename;
} else {
@@ -329,15 +357,15 @@ class Trashbin {
if ($view->is_dir('/files_trashbin/versions/'.$file)) {
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
- $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext));
+ $rootView->rename(\OC\Files\Filesystem::normalizePath($user.'/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner.'/files_versions/' . $ownerPath));
} else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
foreach ($versions as $v) {
if ($timestamp) {
$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
- $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v);
+ $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
} else {
$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
- $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v);
+ $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
}
}
}
@@ -356,7 +384,7 @@ class Trashbin {
* @param $file complete path to file
* @param $filename name of file
* @param $ext file extension in case a file with the same $filename already exists
- * @param $location location if file
+ * @param $location location of file
* @param $timestamp deleteion time
*
* @return size of restored encrypted file
@@ -366,20 +394,25 @@ class Trashbin {
$size = 0;
if (\OCP\App::isEnabled('files_encryption')) {
$user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ $target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+ list($owner, $ownerPath) = self::getUidAndFilename($target);
$path_parts = pathinfo($file);
$source_location = $path_parts['dirname'];
if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
if($source_location != '.') {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename);
- $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename);
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename);
} else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
- $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $filename);
}
} else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
}
if ($timestamp) {
@@ -390,35 +423,36 @@ class Trashbin {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if ($view->file_exists($keyfile)) {
+ if ($rootView->file_exists($keyfile)) {
// handle directory
- if ($view->is_dir($keyfile)) {
+ if ($rootView->is_dir($keyfile)) {
// handle keyfiles
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
- $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext);
+ $size += self::calculateSize(new \OC\Files\View($keyfile));
+ $rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath);
// handle share-keys
if ($timestamp) {
$sharekey .= '.d' . $timestamp;
}
- $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext);
+ $size += self::calculateSize(new \OC\Files\View($sharekey));
+ $rootView->rename($sharekey, $owner.'/files_encryption/share-keys/' . $ownerPath);
} else {
// handle keyfiles
- $size += $view->filesize($keyfile);
- $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext . '.key');
+ $size += $rootView->filesize($keyfile);
+ $rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath . '.key');
// handle share-keys
- $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
+ $ownerShareKey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
if ($timestamp) {
$ownerShareKey .= '.d' . $timestamp;
}
- $size += $view->filesize($ownerShareKey);
+ $size += $rootView->filesize($ownerShareKey);
// move only owners key
- $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext . '.' . $user. '.shareKey');
+ $rootView->rename($ownerShareKey, $owner.'/files_encryption/share-keys/' . $ownerPath . '.' . $user. '.shareKey');
// try to re-share if file is shared
$filesystemView = new \OC_FilesystemView('/');
@@ -426,7 +460,7 @@ class Trashbin {
$util = new \OCA\Encryption\Util($filesystemView, $user);
// fix the file size
- $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $user . '/files/'. $location. '/' .$filename);
+ $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/'. $ownerPath);
$util->fixFileSize($absolutePath);
// get current sharing state
@@ -475,7 +509,25 @@ class Trashbin {
$file = $filename;
}
+ $size += self::deleteVersions($view, $file, $filename, $timestamp);
+ $size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp);
+
+ if ($view->is_dir('/files_trashbin/files/'.$file)) {
+ $size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
+ } else {
+ $size += $view->filesize('/files_trashbin/files/'.$file);
+ }
+ $view->unlink('/files_trashbin/files/'.$file);
+ $trashbinSize -= $size;
+ self::setTrashbinSize($user, $trashbinSize);
+
+ return $size;
+ }
+
+ private static function deleteVersions($view, $file, $filename, $timestamp) {
+ $size = 0;
if ( \OCP\App::isEnabled('files_versions') ) {
+ $user = \OCP\User::getUser();
if ($view->is_dir('files_trashbin/versions/'.$file)) {
$size += self::calculateSize(new \OC\Files\view('/'.$user.'/files_trashbin/versions/'.$file));
$view->unlink('files_trashbin/versions/'.$file);
@@ -491,35 +543,37 @@ class Trashbin {
}
}
}
-
- // Take care of encryption keys
- $parts = pathinfo($file);
- if ( $view->is_dir('/files_trashbin/files/'.$file) ) {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename);
- } else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key');
- }
- if ($timestamp) {
- $keyfile .= '.d'.$timestamp;
- }
- if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
- if ( $view->is_dir($keyfile) ) {
- $size += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
+ return $size;
+ }
+
+ private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $user = \OCP\User::getUser();
+
+ if ($view->is_dir('/files_trashbin/files/' . $file)) {
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
} else {
- $size += $view->filesize($keyfile);
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
+ }
+ if ($timestamp) {
+ $keyfile .= '.d' . $timestamp;
+ $sharekeys .= '.d' . $timestamp;
+ }
+ if ($view->file_exists($keyfile)) {
+ if ($view->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
+ } else {
+ $size += $view->filesize($keyfile);
+ $size += $view->filesize($sharekeys);
+ }
+ $view->unlink($keyfile);
+ $view->unlink($sharekeys);
}
- $view->unlink($keyfile);
- }
-
- if ($view->is_dir('/files_trashbin/files/'.$file)) {
- $size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
- } else {
- $size += $view->filesize('/files_trashbin/files/'.$file);
}
- $view->unlink('/files_trashbin/files/'.$file);
- $trashbinSize -= $size;
- self::setTrashbinSize($user, $trashbinSize);
-
return $size;
}
@@ -779,5 +833,14 @@ class Trashbin {
}
$query->execute(array($size, $user));
}
-
+
+ /**
+ * register hooks
+ */
+ public static function registerHooks() {
+ //Listen to delete file signal
+ \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
+ //Listen to delete user signal
+ \OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
+ }
}
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..940cc2371a107918df31404f5cd3d4504eaa9e71
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
+"success" => "vellukka",
+"File %s was reverted to version %s" => "Tilbakestilte fila %s til utgåva %s",
+"failure" => "feil",
+"File %s could not be reverted to version %s" => "Klarte ikkje tilbakestilla fila %s til utgåva %s",
+"No old versions available" => "Ingen eldre utgåver tilgjengelege",
+"No path specified" => "Ingen sti gjeve",
+"Versions" => "Utgåver",
+"Revert a file to a previous version by clicking on its revert button" => "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
+);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 5fdbef27743b8f719ef4971104e69be6fb72670e..4beb9e0fe5cc18929f4255871836c3de4d009ab8 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -113,8 +113,16 @@ class Storage {
mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
}
+ // disable proxy to prevent multiple fopen calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
// store a new version of a file
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+
+ // reset proxy state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
$versionsSize = self::getVersionsSize($uid);
if ( $versionsSize === false || $versionsSize < 0 ) {
$versionsSize = self::calculateSize($uid);
@@ -195,7 +203,16 @@ class Storage {
//first create a new version
$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
if ( !$users_view->file_exists($version)) {
+
+ // disable proxy to prevent multiple fopen calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+
+ // reset proxy state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
$versionCreated = true;
}
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dab39839b63327b1219dc18b0d97391c13698fa
--- /dev/null
+++ b/apps/user_ldap/ajax/clearMappings.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ownCloud - user_ldap
+ *
+ * @author Arthur Schiwon
+ * @copyright 2013 Arthur Schiwon blizzz@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Check user and app status
+OCP\JSON::checkAdminUser();
+OCP\JSON::checkAppEnabled('user_ldap');
+OCP\JSON::callCheck();
+
+$subject = $_POST['ldap_clear_mapping'];
+if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
+ OCP\JSON::success();
+} else {
+ $l=OC_L10N::get('user_ldap');
+ OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
+}
\ No newline at end of file
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 81eaa0404b759dbef6be6590521b08b47493ef52..593e846bc03f8dea4514bd05cf32c99672e90717 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -49,7 +49,7 @@ $entry = array(
'name' => 'LDAP'
);
-OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
+OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
if(OCP\App::isEnabled('user_webdavauth')) {
OCP\Util::writeLog('user_ldap',
'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 84ada0832ab52f5ac263a65aaf93dde25e22fa71..185952e14bbdda762f427eee7e42084ed9a9badd 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -11,6 +11,10 @@
display: inline-block;
}
+.ldapIndent {
+ margin-left: 50px;
+}
+
.ldapwarning {
margin-left: 1.4em;
color: #FF3B3B;
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 9279dc0203b6ff6274bf145fb55408ce42e0c126..52d5dbc48d97d85431aacedc3aaa417db30816b0 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -14,7 +14,7 @@ var LdapConfiguration = {
//deal with Checkboxes
if($(elementID).is('input[type=checkbox]')) {
- if(configvalue === 1) {
+ if(parseInt(configvalue) === 1) {
$(elementID).attr('checked', 'checked');
} else {
$(elementID).removeAttr('checked');
@@ -99,6 +99,26 @@ var LdapConfiguration = {
}
}
);
+ },
+
+ clearMappings: function(mappingSubject) {
+ $.post(
+ OC.filePath('user_ldap','ajax','clearMappings.php'),
+ 'ldap_clear_mapping='+mappingSubject,
+ function(result) {
+ if(result.status == 'success') {
+ OC.dialogs.info(
+ t('user_ldap', 'mappings cleared'),
+ t('user_ldap', 'Success')
+ );
+ } else {
+ OC.dialogs.alert(
+ result.message,
+ t('user_ldap', 'Error')
+ );
+ }
+ }
+ );
}
}
@@ -166,6 +186,16 @@ $(document).ready(function() {
);
});
+ $('#ldap_action_clear_user_mappings').click(function(event) {
+ event.preventDefault();
+ LdapConfiguration.clearMappings('user');
+ });
+
+ $('#ldap_action_clear_group_mappings').click(function(event) {
+ event.preventDefault();
+ LdapConfiguration.clearMappings('group');
+ });
+
$('#ldap_serverconfig_chooser').change(function(event) {
value = $('#ldap_serverconfig_chooser option:selected:first').attr('value');
if(value === 'NEW') {
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 4d7b7ac4ade26c6a187b92dce01b2ad567e68f68..5f8b6b8145514e00aabda1c4908a04848c0c0544 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "فشل الحذف",
+"Error" => "خطأ",
"Password" => "كلمة المرور",
"Help" => "المساعدة"
);
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index c064534a6b8a16924045f7478c423f53d0d50ece..0330046d80e00c6018e5b427823472148acbc26f 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Грешка",
"Password" => "Парола",
"Help" => "Помощ"
);
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 69dfc8961792f1c28f914ec45f4b8907398869e6..4cee35777df353a724ad0ed574a27d7ede63f7ff 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "সমস্যা",
"Host" => "হোস্ট",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশ্যক না হলে আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
"Base DN" => "ভিত্তি DN",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 8f2799b6e6840c39149df5b6ec947cae17a1620e..7f0849b2382e3b5c9616c7e219652ea3a8d6bd3a 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
"Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
"The configuration is valid and the connection could be established!" => "La configuració és vàlida i s'ha pogut establir la comunicació!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
"Keep settings?" => "Voleu mantenir la configuració?",
"Cannot add server configuration" => "No es pot afegir la configuració del servidor",
+"mappings cleared" => "s'han eliminat els mapatges",
+"Success" => "Èxit",
+"Error" => "Error",
"Connection test succeeded" => "La prova de connexió ha reeixit",
"Connection test failed" => "La prova de connexió ha fallat",
"Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuració actual del servidor?",
@@ -70,6 +74,16 @@
"Email Field" => "Camp de correu electrònic",
"User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+"Internal Username" => "Nom d'usuari intern",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+"Internal Username Attribute:" => "Atribut nom d'usuari intern:",
+"Override UUID detection" => "Sobrescriu la detecció UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits).",
+"UUID Attribute:" => "Atribut UUID:",
+"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova.",
+"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP",
"Test Configuration" => "Comprovació de la configuració",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c5d77026b9e9b317dc7b6a1bbc46ef67d1ef298a..dd7373eb690a66b6d8dbb7bf81712c187b50007e 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Převzít nastavení z nedávného nastavení serveru?",
"Keep settings?" => "Ponechat nastavení?",
"Cannot add server configuration" => "Nelze přidat nastavení serveru",
+"Success" => "Úspěch",
+"Error" => "Chyba",
"Connection test succeeded" => "Test spojení byl úspěšný",
"Connection test failed" => "Test spojení selhal",
"Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index 335e2109c2db7d79a7980b07cd1eb3f409db351d..abe2336b2ba8c9fdbd5e9ca74a0d95030b2746dc 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Methwyd dileu",
+"Error" => "Gwall",
"Password" => "Cyfrinair",
"Help" => "Cymorth"
);
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 9329c4e8a2416f1db1fd0993a1d6f28f76f62c0d..0a77f46647977050177d02cbb51c4977986611f4 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Fejl ved sletning",
+"Success" => "Succes",
+"Error" => "Fejl",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
"Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 27f5adb8b6c19327124f872dd79e41ef59523519..f00108184214f9c959315ec7100f66ce7316d276 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolgreich",
+"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
"Connection test failed" => "Verbindungstest fehlgeschlagen",
"Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 488d8aad7c8d85403297b13ef26db951d1ab153d..8aa64477e41bcf2cc13d05d7394a09b243f38d07 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolg",
+"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
"Connection test failed" => "Verbindungstest fehlgeschlagen",
"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
@@ -70,6 +72,10 @@
"Email Field" => "E-Mail-Feld",
"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+"Override UUID detection" => "UUID-Erkennung überschreiben",
+"UUID Attribute:" => "UUID-Attribut:",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index e5fe6b6da7e3f245b95b2fef5a3a56369c504be2..acecf27125f1a2287c37402ca570016dd5c68539 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
"Keep settings?" => "Διατήρηση ρυθμίσεων;",
"Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+"Success" => "Επιτυχία",
+"Error" => "Σφάλμα",
"Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
"Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.",
"Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 3ffcbddb3e3652e6d2696ed333520bef2b883414..c9a9ba130c6fbd2c9bcaa49127fb61f473c6b490 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Forigo malsukcesis",
+"Success" => "Sukceso",
+"Error" => "Eraro",
"Host" => "Gastigo",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
"Base DN" => "Bazo-DN",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 098e16a5d130034a571ed6316d16852859322540..31d43288e5bc0ce25e6ea3bbd5bf8eb158f1b65c 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,17 +1,21 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ocurrió un fallo al borrar las asignaciones.",
"Failed to delete the server configuration" => "No se pudo borrar la configuración del servidor",
"The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión puede establecerse!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "La configuración no es válida. Por favor, busque en el log de ownCloud para más detalles.",
"Deletion failed" => "Falló el borrado",
-"Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
+"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
"Keep settings?" => "Mantener la configuración?",
"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
+"Success" => "Éxito",
+"Error" => "Error",
"Connection test succeeded" => "La prueba de conexión fue exitosa",
"Connection test failed" => "La prueba de conexión falló",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
"Confirm Deletion" => "Confirmar eliminación",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
"Server configuration" => "Configuración del Servidor",
"Add Server Configuration" => "Agregar configuracion del servidor",
@@ -26,30 +30,30 @@
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como placeholder, ej: \"uid=%%uid\"",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como comodín, ej: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin placeholder, ej: \"objectClass=person\".",
+"without any placeholder, e.g. \"objectClass=person\"." => "Sin comodines, ej: \"objectClass=person\".",
"Group Filter" => "Filtro de grupo",
"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Con cualquier placeholder, ej: \"objectClass=posixGroup\".",
-"Connection Settings" => "Configuracion de coneccion",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sin comodines, ej: \"objectClass=posixGroup\".",
+"Connection Settings" => "Configuración de conexión",
"Configuration Active" => "Configuracion activa",
"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
"Port" => "Puerto",
-"Backup (Replica) Host" => "Host para backup (Replica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
-"Backup (Replica) Port" => "Puerto para backup (Replica)",
+"Backup (Replica) Host" => "Servidor de copia de seguridad (Replica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
"Disable Main Server" => "Deshabilitar servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica",
+"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente conectará al servidor replica",
"Use TLS" => "Usar TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conecciones LDAPS, estas fallaran",
-"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
+"Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
+"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
"Cache Time-To-Live" => "Cache TTL",
-"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la cache.",
+"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
"Directory Settings" => "Configuracion de directorio",
"User Display Name Field" => "Campo de nombre de usuario a mostrar",
"The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
@@ -70,6 +74,16 @@
"Email Field" => "E-mail",
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nombre de usuario interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto el nombre de usuario interno será creado desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente quitados. En coincidencias un número será añadido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es también el nombre por defecto para la carpeta personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. Déjalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
+"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los nuevos usuarios y grupos de LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda"
);
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index c8aec0cd41ba2d901ffdb5920182e2bc03aa2a3b..98fb32b1d26e902e19b819bf0e4c2aa506ec2fdd 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
"Keep settings?" => "¿Mantener preferencias?",
"Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"Success" => "Éxito",
+"Error" => "Error",
"Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
"Connection test failed" => "Falló es test de conexión",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 9a65455ed23ec12d6928d7f01a00e3c5d2a88e23..39346def039f056196426f3f0965df2cb217b9c1 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,14 +1,18 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Vastendususte puhastamine ebaõnnestus.",
"Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
"The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "Seadistus on vigane. Palun vaata ownCloud logist täpsemalt.",
"Deletion failed" => "Kustutamine ebaõnnestus",
"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
-"Keep settings?" => "Säilitada seadistus?",
+"Keep settings?" => "Säilitada seadistused?",
"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
-"Connection test succeeded" => "Test ühendus õnnestus",
-"Connection test failed" => "Test ühendus ebaõnnestus",
+"mappings cleared" => "vastendused puhastatud",
+"Success" => "Korras",
+"Error" => "Viga",
+"Connection test succeeded" => "Ühenduse testimine õnnestus",
+"Connection test failed" => "Ühenduse testimine ebaõnnestus",
"Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
"Confirm Deletion" => "Kinnita kustutamine",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
@@ -70,6 +74,16 @@
"Email Field" => "Email atribuut",
"User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+"Internal Username" => "Sisemine kasutajanimi",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
+"Override UUID detection" => "Tühista UUID tuvastus",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"UUID Attribute:" => "UUID atribuut:",
+"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
"Test Configuration" => "Testi seadistust",
"Help" => "Abiinfo"
);
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 5e9fd014c64f3a5875ea41d396007b1a078e0e67..42f184e53902efa1b5af5bec74247e2a255bf8ed 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
"Keep settings?" => "Mantendu ezarpenak?",
"Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu",
+"Success" => "Arrakasta",
+"Error" => "Errorea",
"Connection test succeeded" => "Konexio froga ongi burutu da",
"Connection test failed" => "Konexio frogak huts egin du",
"Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 89fc40af4f18d96f59115924f4d870a641fba194..bef13457adb7cc80bae02c2464a5aa7a84aa7e71 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -3,6 +3,7 @@
"The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
"Deletion failed" => "حذف کردن انجام نشد",
"Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
+"Error" => "خطا",
"Connection test succeeded" => "تست اتصال با موفقیت انجام گردید",
"Connection test failed" => "تست اتصال ناموفق بود",
"Do you really want to delete the current Server Configuration?" => "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38ecb5d82a882f55dfa576ca8305aa0793c222db..38a8b99cf7e5424a0fd82fba75cb240869b265a3 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -2,6 +2,8 @@
"Deletion failed" => "Poisto epäonnistui",
"Keep settings?" => "Säilytetäänkö asetukset?",
"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
+"Success" => "Onnistui!",
+"Error" => "Virhe",
"Connection test succeeded" => "Yhteystesti onnistui",
"Connection test failed" => "Yhteystesti epäonnistui",
"Confirm Deletion" => "Vahvista poisto",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index ea07bd4a11c19a9e870dd5b03f34c78d3974d905..11f8fbaaf4483ec1f1fb8507a81f8c0f946f7505 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
"Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
@@ -6,9 +7,12 @@
"Deletion failed" => "La suppression a échoué",
"Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
"Keep settings?" => "Garder ces paramètres ?",
-"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur.",
+"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
+"mappings cleared" => "associations supprimées",
+"Success" => "Succès",
+"Error" => "Erreur",
"Connection test succeeded" => "Test de connexion réussi",
-"Connection test failed" => "Le test de connexion a échoué",
+"Connection test failed" => "Test de connexion échoué",
"Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
"Confirm Deletion" => "Confirmer la suppression",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
@@ -17,13 +21,13 @@
"Add Server Configuration" => "Ajouter une configuration du serveur",
"Host" => "Hôte",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
-"Base DN" => "DN Racine",
+"Base DN" => "DN racine",
"One Base DN per line" => "Un DN racine par ligne",
"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
"User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
"Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
"User Login Filter" => "Modèle d'authentification utilisateurs",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
@@ -66,10 +70,20 @@
"Special Attributes" => "Attributs spéciaux",
"Quota Field" => "Champ du quota",
"Quota Default" => "Quota par défaut",
-"in bytes" => "en octets",
+"in bytes" => "en bytes",
"Email Field" => "Champ Email",
"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
+"Internal Username" => "Nom d'utilisateur interne",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+"Internal Username Attribute:" => "Nom d'utilisateur interne:",
+"Override UUID detection" => "Surcharger la détection d'UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
+"UUID Attribute:" => "Attribut UUID :",
+"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation.",
+"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
"Test Configuration" => "Tester la configuration",
"Help" => "Aide"
);
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 215d518e7a5f85e5402567bb74a1ef548752bc87..3f44ccd9bd1a0a95a2b87ec43f4dd1894f7a9897 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Non foi posíbel limpar as asignacións.",
"Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
"The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
"Keep settings?" => "Manter os axustes?",
"Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
+"mappings cleared" => "limpadas as asignacións",
+"Success" => "Correcto",
+"Error" => "Erro",
"Connection test succeeded" => "A proba de conexión foi satisfactoria",
"Connection test failed" => "A proba de conexión fracasou",
"Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo do correo",
"User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nome de usuario interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"Internal Username Attribute:" => "Atributo do nome de usuario interno:",
+"Override UUID detection" => "Ignorar a detección do UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"UUID Attribute:" => "Atributo do UUID:",
+"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»",
"Test Configuration" => "Probar a configuración",
"Help" => "Axuda"
);
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 97259a0ddd5f1df79be4f380b24c6b6858588389..0d60768dcfccc232f58642638c133aceed661bce 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -2,6 +2,7 @@
"Deletion failed" => "מחיקה נכשלה",
"Keep settings?" => "האם לשמור את ההגדרות?",
"Cannot add server configuration" => "לא ניתן להוסיף את הגדרות השרת",
+"Error" => "שגיאה",
"Connection test succeeded" => "בדיקת החיבור עברה בהצלחה",
"Connection test failed" => "בדיקת החיבור נכשלה",
"Do you really want to delete the current Server Configuration?" => "האם אכן למחוק את הגדרות השרת הנוכחיות?",
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index 005a76d4bbc0ea523d4c973ffed057827f6d6536..cc8918301f5e955b179f81bc7e044cf75e0f304c 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Greška",
"Password" => "Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index a82a64ab32f1387660ebfb3b93c38cf19f6db002..361ae5e0403152cb86e1aad06104744065fc636e 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nem sikerült törölni a hozzárendeléseket.",
"Failed to delete the server configuration" => "Nem sikerült törölni a kiszolgáló konfigurációját",
"The configuration is valid and the connection could be established!" => "A konfiguráció érvényes, és a kapcsolat létrehozható!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Vegyük át a beállításokat az előző konfigurációból?",
"Keep settings?" => "Tartsuk meg a beállításokat?",
"Cannot add server configuration" => "Az új kiszolgáló konfigurációja nem hozható létre",
+"mappings cleared" => "Töröltük a hozzárendeléseket",
+"Success" => "Sikeres végrehajtás",
+"Error" => "Hiba",
"Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
"Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?",
@@ -70,6 +74,13 @@
"Email Field" => "Email mező",
"User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
+"Internal Username" => "Belső felhasználónév",
+"Internal Username Attribute:" => "A belső felhasználónév attribútuma:",
+"Override UUID detection" => "Az UUID-felismerés felülbírálása",
+"UUID Attribute:" => "UUID attribútum:",
+"Username-LDAP User Mapping" => "Felhasználó - LDAP felhasználó hozzárendelés",
+"Clear Username-LDAP User Mapping" => "A felhasználó - LDAP felhasználó hozzárendelés törlése",
+"Clear Groupname-LDAP Group Mapping" => "A csoport - LDAP csoport hozzárendelés törlése",
"Test Configuration" => "A beállítások tesztelése",
"Help" => "Súgó"
);
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 38374abda7f91fc001c9d0918a6ece10a183f3c6..624fd4fa0eb460d3e1053c539407864a390208ed 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Error",
"Password" => "Contrasigno",
"Help" => "Adjuta"
);
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 5f76d6b99fbd884eaac1a1a1c2789f725d8a8ce1..c04d09fc671b0f531b856845cf33e5f5f27480fc 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?",
"Keep settings?" => "Biarkan pengaturan?",
"Cannot add server configuration" => "Gagal menambah konfigurasi server",
+"Success" => "Sukses",
+"Error" => "Galat",
"Connection test succeeded" => "Tes koneksi sukses",
"Connection test failed" => "Tes koneksi gagal",
"Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 29bc769279588e25bbe41e52870b0dd4c362851f..dadac9eedaafec867fc819fadf930a242865807a 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Villa",
"Host" => "Netþjónn",
"Password" => "Lykilorð",
"Help" => "Hjálp"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index a2790fd1dec60f2a6e4079930e25590b93878d89..48bcbdf589a17a16d42851bf96b822ef165a759e 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
"Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
"The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
"Keep settings?" => "Vuoi mantenere le impostazioni?",
"Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
+"mappings cleared" => "associazioni cancellate",
+"Success" => "Riuscito",
+"Error" => "Errore",
"Connection test succeeded" => "Prova di connessione riuscita",
"Connection test failed" => "Prova di connessione non riuscita",
"Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo Email",
"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+"Internal Username" => "Nome utente interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+"Internal Username Attribute:" => "Attributo nome utente interno:",
+"Override UUID detection" => "Ignora rilevamento UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+"UUID Attribute:" => "Attributo UUID:",
+"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test.",
+"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
"Test Configuration" => "Prova configurazione",
"Help" => "Aiuto"
);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 8239ecf3cc9b74743c97b63300e0ff27d7941246..53fa9ae697df3760b086c28d249b71168440f19f 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "マッピングのクリアに失敗しました。",
"Failed to delete the server configuration" => "サーバ設定の削除に失敗しました",
"The configuration is valid and the connection could be established!" => "設定は有効であり、接続を確立しました！",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定は有効ですが、接続に失敗しました。サーバ設定と資格情報を確認して下さい。",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "最近のサーバ設定から設定を引き継ぎますか？",
"Keep settings?" => "設定を保持しますか？",
"Cannot add server configuration" => "サーバ設定を追加できません",
+"mappings cleared" => "マッピングをクリアしました",
+"Success" => "成功",
+"Error" => "エラー",
"Connection test succeeded" => "接続テストに成功しました",
"Connection test failed" => "接続テストに失敗しました",
"Do you really want to delete the current Server Configuration?" => "現在のサーバ設定を本当に削除してもよろしいですか？",
@@ -70,6 +74,16 @@
"Email Field" => "メールフィールド",
"User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。",
+"Internal Username" => "内部ユーザ名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が必要ないことを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。",
+"Internal Username Attribute:" => "内部ユーザ名属性:",
+"Override UUID detection" => "UUID検出を再定義する",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、ownCloud は UUID 属性を自動的に検出します。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。",
+"UUID Attribute:" => "UUID属性:",
+"Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピング",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloudは（メタ） データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ownCloudユーザ名とLDAPユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、LDAPユーザのUUIDとマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更をownCloudが見つけます。内部のownCloud名はownCloud全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+"Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
+"Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする",
"Test Configuration" => "設定をテスト",
"Help" => "ヘルプ"
);
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index b3f6058a0ca421e505ada2913fb52f93ce054f1d..8057f7c845550bdb99e486cf344c5dc9dca4b5c6 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
"Keep settings?" => "დავტოვოთ პარამეტრები?",
"Cannot add server configuration" => "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+"Success" => "დასრულდა",
+"Error" => "შეცდომა",
"Connection test succeeded" => "კავშირის ტესტირება მოხერხდა",
"Connection test failed" => "კავშირის ტესტირება ვერ მოხერხდა",
"Do you really want to delete the current Server Configuration?" => "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 8aa9fe74b3d1f513c3c73de5c3b58f0930c2557e..b8196e09d09a93f9e4adf0915b35466de90718b2 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "삭제 실패",
"Keep settings?" => "설정을 유지합니까?",
+"Error" => "오류",
"Connection test succeeded" => "연결 시험 성공",
"Connection test failed" => "연결 시험 실패",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>경고:</b> user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오.",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index f8f893834b1d66bfee073402899aa36ee46e9a39..00602ae5d79c4b80e14384f64f43c4499fa08486 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"Success" => "سهرکهوتن",
+"Error" => "ههڵه",
"Password" => "وشەی تێپەربو",
"Help" => "یارمەتی"
);
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index 39ed627ce2c92fc3d9a169b91f3d8bfcebcf34e3..cf58c9ec5be9c0ba08f0b2bf0898f229ae1037ff 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Konnt net läschen",
+"Error" => "Fehler",
"Password" => "Passwuert",
"Help" => "Hëllef"
);
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index aa21dd2d3c164aab23dd346d23ec69aee5f62389..6f396847b8efeb640890231ca1ad4c8b979b6407 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Ištrinti nepavyko",
+"Error" => "Klaida",
"Password" => "Slaptažodis",
"Group Filter" => "Grupės filtras",
"Port" => "Prievadas",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 50126664e5be9fc8205e6f80bfb3926551c9a948..73ffedcb134637416ea928d11bbc11911020824b 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -7,6 +7,7 @@
"Take over settings from recent server configuration?" => "Paņemt iestatījumus no nesenas servera konfigurācijas?",
"Keep settings?" => "Paturēt iestatījumus?",
"Cannot add server configuration" => "Nevar pievienot servera konfigurāciju",
+"Error" => "Kļūda",
"Connection test succeeded" => "Savienojuma tests ir veiksmīgs",
"Connection test failed" => "Savienojuma tests cieta neveiksmi",
"Do you really want to delete the current Server Configuration?" => "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 7d34ff49492ec982e3c420ff6561f1fb719c181b..6a060aca415cc55fd885e95b60da06258b2546fe 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Бришењето е неуспешно",
+"Error" => "Грешка",
"Host" => "Домаќин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
"Password" => "Лозинка",
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 88ed18346ca68b2ba8868c0ba11ab9d8fea16eb3..b3004028c58a2c83fff365ee58520103376636cb 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Pemadaman gagal",
+"Error" => "Ralat",
"Password" => "Kata laluan",
"Help" => "Bantuan"
);
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index c4700245f24059f50b3be04e0bd8c061b40d3d5d..f8cdf694ff6f2d392f90dbcda07db766a0cee9aa 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
"Keep settings?" => "Behold innstillinger?",
"Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"Success" => "Suksess",
+"Error" => "Feil",
"Connection test succeeded" => "Tilkoblingstest lyktes",
"Connection test failed" => "Tilkoblingstest mislyktes",
"Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 7973c66cd10d8cc3d5dee001a2a04d787aa6d63f..c75aae3ea4f57fe2e0e43cc2d5e1e7af3f8b7ad4 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
"Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
"The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
"Keep settings?" => "Instellingen bewaren?",
"Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
+"mappings cleared" => "vertaaltabel leeggemaakt",
+"Success" => "Succes",
+"Error" => "Fout",
"Connection test succeeded" => "Verbindingstest geslaagd",
"Connection test failed" => "Verbindingstest mislukt",
"Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
@@ -70,6 +74,16 @@
"Email Field" => "E-mailveld",
"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+"Internal Username" => "Interne gebruikersnaam",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers.",
+"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
+"Override UUID detection" => "Negeren UUID detectie",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen.",
+"UUID Attribute:" => "UUID Attribuut:",
+"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving.",
+"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
"Test Configuration" => "Test configuratie",
"Help" => "Help"
);
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 9f84258c56df577c0b2187ab6290952de3a9fe7a..459100228035b1ecbc424f6fc9bb06e0613ca3a1 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Feil ved sletting",
+"Error" => "Feil",
"Password" => "Passord",
"Help" => "Hjelp"
);
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 49b6c5970cc0427fff0d407ee4187fd3dc49b499..95ab51caadd798298171fce3ddd897a38e458115 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Fracàs d'escafatge",
+"Error" => "Error",
"Password" => "Senhal",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index a5b620e48badde8c338b4c35aa516f8f21e50038..7edfe0919eba1978e6827feb2f2021ca569de7e5 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nie udało się wyczyścić mapowania.",
"Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
"Keep settings?" => "Zachować ustawienia?",
"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
+"mappings cleared" => "Mapoanie wyczyszczone",
+"Success" => "Sukces",
+"Error" => "Błąd",
"Connection test succeeded" => "Test połączenia udany",
"Connection test failed" => "Test połączenia nie udany",
"Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
@@ -70,6 +74,13 @@
"Email Field" => "Pole email",
"User Home Folder Naming Rule" => "Reguły nazewnictwa folderu domowego użytkownika",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
+"Internal Username" => "Wewnętrzna nazwa użytkownika",
+"Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
+"Override UUID detection" => "Zastąp wykrywanie UUID",
+"UUID Attribute:" => "Atrybuty UUID:",
+"Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
+"Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP",
"Test Configuration" => "Konfiguracja testowa",
"Help" => "Pomoc"
);
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index a728ea15fde20d9a9e366d70841a6a81f8b61261..22247b81005b43eb620917c4b2f4186963285777 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
"Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
"The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
"Keep settings?" => "Manter ajustes?",
"Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
+"mappings cleared" => "mapeamentos limpos",
+"Success" => "Sucesso",
+"Error" => "Erro",
"Connection test succeeded" => "Teste de conexão bem sucedida",
"Connection test failed" => "Teste de conexão falhou",
"Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo de Email",
"User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+"Internal Username" => "Nome de usuário interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituídas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. ",
+"Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
+"Override UUID detection" => "Substituir detecção UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensíveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental.",
+"Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo",
"Test Configuration" => "Teste de Configuração",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 02b03d5a752160fcf79d623457dd61e815e545fe..ed1e0f376db9b1daae01a2b2267b09aa278b6ee6 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
"Keep settings?" => "Manter as definições?",
"Cannot add server configuration" => "Não foi possível adicionar as configurações do servidor.",
+"Success" => "Sucesso",
+"Error" => "Erro",
"Connection test succeeded" => "Teste de conecção passado com sucesso.",
"Connection test failed" => "Erro no teste de conecção.",
"Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 8f55a35b4916dccc41dc74146411ebcd3200d550..260ee610639b4b0066d0f5f6d76abd803763108a 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Ștergerea a eșuat",
+"Success" => "Succes",
+"Error" => "Eroare",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
"Host" => "Gazdă",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0746e1e8929f33876af29823c6d528d77e626199..eed6d373b9f0cad67262378cfb8ddada1e1cf2f5 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
"Keep settings?" => "Сохранить настройки?",
"Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
+"Success" => "Успешно",
+"Error" => "Ошибка",
"Connection test succeeded" => "Проверка соединения удалась",
"Connection test failed" => "Проверка соединения не удалась",
"Do you really want to delete the current Server Configuration?" => "Вы действительно хотите удалить существующую конфигурацию сервера?",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index a4ed503b1d12d3646de81295be67ae5e718e9d5f..7b6833ebf8cd2d6827a929379fb7de529b0d18ee 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,42 +1,4 @@
<?php $TRANSLATIONS = array(
-"Deletion failed" => "Удаление не удалось",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Модуль PHP LDAP не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его.",
-"Host" => "Хост",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
-"Base DN" => "База DN",
-"One Base DN per line" => "Одно базовое DN на линию",
-"You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»",
-"User DN" => "DN пользователя",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми.",
-"Password" => "Пароль",
-"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.",
-"User Login Filter" => "Фильтр имен пользователей",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте %%uid заполнитель, например, \"uid=%%uid\"",
-"User List Filter" => "Фильтр списка пользователей",
-"Defines the filter to apply, when retrieving users." => "Задает фильтр, применяемый при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
-"Group Filter" => "Групповой фильтр",
-"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применяемый при получении групп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
-"Port" => "Порт",
-"Use TLS" => "Использовать TLS",
-"Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру LDAP-сервер (Windows)",
-"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер.",
-"Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
-"in seconds. A change empties the cache." => "в секундах. Изменение очищает кэш.",
-"User Display Name Field" => "Поле, отображаемое как имя пользователя",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
-"Base User Tree" => "Базовое дерево пользователей",
-"One User Base DN per line" => "Одно пользовательское базовое DN на линию",
-"Group Display Name Field" => "Поле, отображаемое как имя группы",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
-"Base Group Tree" => "Базовое дерево групп",
-"One Group Base DN per line" => "Одно групповое базовое DN на линию",
-"Group-Member association" => "Связь член-группа",
-"in bytes" => "в байтах",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.",
-"Help" => "Помощь"
+"Success" => "Успех",
+"Error" => "Ошибка"
);
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 50124e4d54f1f8f604b32dab2172dfe9b8b8cf13..1d81b341b46242d9567de7ef2b2ac2780f50d70e 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "මකාදැමීම අසාර්ථකයි",
+"Success" => "සාර්ථකයි",
+"Error" => "දෝෂයක්",
"Host" => "සත්කාරකය",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවශ්යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
"Password" => "මුර පදය",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index cb55762e64f6beeea256f7a145d1dc5fdeed53dd..e36a1589367219db8f8038a1fd50dbf786dceae1 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nepodarilo sa vymazať mapovania.",
"Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
"The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilné.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
"Keep settings?" => "Ponechať nastavenia?",
"Cannot add server configuration" => "Nemožno pridať nastavenie servera",
+"mappings cleared" => "mapovanie vymazané",
+"Success" => "Úspešné",
+"Error" => "Chyba",
"Connection test succeeded" => "Test pripojenia bol úspešný",
"Connection test failed" => "Test pripojenia zlyhal",
"Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazať súčasné nastavenie servera?",
@@ -70,6 +74,11 @@
"Email Field" => "Pole email",
"User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena používateľského priečinka dát",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
+"Internal Username" => "Interné používateľské meno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách bude číslo byť pridané / odobrané. Interné používateľské meno sa používa na identifikáciu používateľa interne. Je to tiež predvolený názov používateľského domovského priečinka v ownCloud. To je tiež port vzdialeného URL, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo mapovaných (pridaných) LDAP používateľov.",
+"Internal Username Attribute:" => "Atribút interného používateľského mena:",
+"Override UUID detection" => "Prepísať UUID detekciu",
+"UUID Attribute:" => "UUID atribút:",
"Test Configuration" => "Test nastavenia",
"Help" => "Pomoc"
);
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 8ff1fd53440eb2d77f168478e17683c3b1eb2e51..1ade5d9b733f3ef7e8dcc11e4d9d8e2d2e6b4a92 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?",
"Keep settings?" => "Ali nas se nastavitve ohranijo?",
"Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika",
+"Success" => "Uspešno končano.",
+"Error" => "Napaka",
"Connection test succeeded" => "Preizkus povezave je uspešno končan.",
"Connection test failed" => "Preizkus povezave je spodletel.",
"Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 24fd869057ddd922bb0a53a40722bf15f0f2dbf2..12324b9f966cfe6fa5ea2caab20182dccafc39d4 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Veprim i gabuar",
"Password" => "Kodi",
"Help" => "Ndihmë"
);
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 52569a08ef831d37f4a082678d442192c8a1b414..b94bc83e1e477166237a64ae530da8eec4491de7 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Брисање није успело",
+"Error" => "Грешка",
"Host" => "Домаћин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
"Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 1bb4d9dc0b15b092e961bff2e83d1269701ce14b..eb30bd22f019b24fc08023cf062748f644aa44be 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
"Keep settings?" => "Behåll inställningarna?",
"Cannot add server configuration" => "Kunde inte lägga till serverinställning",
+"Success" => "Lyckat",
+"Error" => "Fel",
"Connection test succeeded" => "Anslutningstestet lyckades",
"Connection test failed" => "Anslutningstestet misslyckades",
"Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index f6beb3c48630c51f702acdac786cfc320da4ef22..997f09ca8776bb98ad62959ef6df024f749a1dd8 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "நீக்கம் தோல்வியடைந்தது",
+"Error" => "வழு",
"Host" => "ஓம்புனர்",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
"Base DN" => "தள DN",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index d9a3e713f034d3bafd328301ad48b6925a02576e..3f047631cf70efdb246ea3fbd13df274b80d07b2 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "పొరపాటు",
"Password" => "సంకేతపదం",
"Help" => "సహాయం"
);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 802badb2f0304e4352af8874496f64f328087cc4..ec279ba01e5e97dc355cf1642678b572d962129e 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -6,6 +6,8 @@
"Deletion failed" => "การลบทิ้งล้มเหลว",
"Keep settings?" => "รักษาการตั้งค่าไว้?",
"Cannot add server configuration" => "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
+"Success" => "เสร็จสิ้น",
+"Error" => "ข้อผิดพลาด",
"Connection test succeeded" => "ทดสอบการเชื่อมต่อสำเร็จ",
"Connection test failed" => "ทดสอบการเชื่อมต่อล้มเหลว",
"Do you really want to delete the current Server Configuration?" => "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 6f75f4371db68e02c0442e6e3a3e8456c1908e0b..3835c72313ab32688bcaed94b6669dcc989c3ada 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,15 +1,16 @@
<?php $TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Sunucu uyunlama basarmadi ",
-"The configuration is valid and the connection could be established!" => "Uyunlama mantikli ve baglama yerlestirmek edebilmi.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. ",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. ",
+"Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
+"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız.",
"Deletion failed" => "Silme başarısız oldu",
-"Take over settings from recent server configuration?" => "Parametri sonadan uyunlama cikarmak mi?",
-"Keep settings?" => "Ayarları kalsınmı?",
-"Cannot add server configuration" => "Sunucu uyunlama birlemek edemen. ",
+"Take over settings from recent server configuration?" => "Ayarları son sunucu yapılandırmalarından devral?",
+"Keep settings?" => "Ayarlar kalsın mı?",
+"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
+"Error" => "Hata",
"Connection test succeeded" => "Bağlantı testi başarılı oldu",
"Connection test failed" => "Bağlantı testi başarısız oldu",
-"Do you really want to delete the current Server Configuration?" => "Hakikatten, Sonuncu Funksyon durmak istiyor mi?",
+"Do you really want to delete the current Server Configuration?" => "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
"Confirm Deletion" => "Silmeyi onayla",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin.",
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 05a7a3f9a06506c2d10f141354233be73f1107d0..8634cdbe1bec1b8ab32e3e0b0895a87eea006e0c 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
+"Error" => "خاتالىق",
"Host" => "باش ئاپپارات",
"Password" => "ئىم",
"User Login Filter" => "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 623d34c98e6a5f3a26b8a8b58b4187a5e95c07d9..f92c6d5894ef6ffd87102c880a45c401f1ff9c90 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Застосувати налаштування з останньої конфігурації сервера ?",
"Keep settings?" => "Зберегти налаштування ?",
"Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
+"Success" => "Успіх",
+"Error" => "Помилка",
"Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
"Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
"Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 4c606a138081f80fed2752ffeaba5a345108481a..83570a596a24b06d91371aed8ebf8206acc1ce02 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "ایرر",
"Password" => "پاسورڈ",
"Help" => "مدد"
);
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 4bbb977f36362ff85c5375811920f57e19b753ea..7e598225926a4eff92474a16eeb370f87b3adcca 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Xóa thất bại",
+"Success" => "Thành công",
+"Error" => "Lỗi",
"Host" => "Máy chủ",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
"Base DN" => "DN cơ bản",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index f5bc41fd46b3df5cf756bc50d09df33f7a78036a..6c60ec64e270aadb8159b4b72f35364b8cabf380 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "删除失败",
+"Success" => "成功",
+"Error" => "出错",
"Host" => "主机",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头",
"Base DN" => "基本判别名",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 1911734805fbba894a2c85335f55fc74282f2df5..7b8389227aec8bf927826bc2b722d104c97c3c2f 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？",
"Keep settings?" => "保留设置吗？",
"Cannot add server configuration" => "无法添加服务器配置",
+"Success" => "成功",
+"Error" => "错误",
"Connection test succeeded" => "连接测试成功",
"Connection test failed" => "连接测试失败",
"Do you really want to delete the current Server Configuration?" => "您真的想要删除当前服务器配置吗？",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index 190e4eba798e9dafde81516fcd728426558ad291..ba55c4147905453e86c73a362a57fe7998dbe7a9 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"Success" => "成功",
+"Error" => "錯誤",
"Password" => "密碼",
"Port" => "連接埠",
"Help" => "幫助"
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 9a12bad07479e0f20cf24d60ad6a114cafbc410d..d01e75356c05efb2de994564d50f465664499367 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "移除失敗",
+"Success" => "成功",
+"Error" => "錯誤",
"Host" => "主機",
"Password" => "密碼",
"Port" => "連接阜",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index ad355ce5e24d25c20c05c92d51a7bd71f87b8e4e..04f73cf01fe96b25895e12bb74b7287e15362c17 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -317,7 +317,19 @@ abstract class Access {
}
$ldapname = $ldapname[0];
}
- $intname = $isUser ? $this->sanitizeUsername($uuid) : $ldapname;
+
+ if($isUser) {
+ $usernameAttribute = $this->connection->ldapExpertUsernameAttr;
+ if(!emptY($usernameAttribute)) {
+ $username = $this->readAttribute($dn, $usernameAttribute);
+ $username = $username[0];
+ } else {
+ $username = $uuid;
+ }
+ $intname = $this->sanitizeUsername($username);
+ } else {
+ $intname = $ldapname;
+ }
//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
//disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check
@@ -429,8 +441,8 @@ abstract class Access {
//while loop is just a precaution. If a name is not generated within
//20 attempts, something else is very wrong. Avoids infinite loop.
while($attempts < 20){
- $altName = $name . '_' . uniqid();
- if(\OCP\User::userExists($altName)) {
+ $altName = $name . '_' . rand(1000,9999);
+ if(!\OCP\User::userExists($altName)) {
return $altName;
}
$attempts++;
@@ -897,6 +909,12 @@ abstract class Access {
return true;
}
+ $fixedAttribute = $this->connection->ldapExpertUUIDAttr;
+ if(!empty($fixedAttribute)) {
+ $this->connection->ldapUuidAttribute = $fixedAttribute;
+ return true;
+ }
+
//for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID
$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid');
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 88ff318586ae7e9765011c3d089793fb28982385..409f3758792ebe147642d0528e9429774b75aa07 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -65,6 +65,8 @@ class Connection {
'ldapAttributesForGroupSearch' => null,
'homeFolderNamingRule' => null,
'hasPagedResultSupport' => false,
+ 'ldapExpertUsernameAttr' => null,
+ 'ldapExpertUUIDAttr' => null,
);
/**
@@ -265,6 +267,10 @@ class Connection {
= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_user_search'));
$this->config['ldapAttributesForGroupSearch']
= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_group_search'));
+ $this->config['ldapExpertUsernameAttr']
+ = $this->$v('ldap_expert_username_attr');
+ $this->config['ldapExpertUUIDAttr']
+ = $this->$v('ldap_expert_uuid_attr');
$this->configured = $this->validateConfiguration();
}
@@ -290,7 +296,6 @@ class Connection {
'ldap_group_filter'=>'ldapGroupFilter',
'ldap_display_name'=>'ldapUserDisplayName',
'ldap_group_display_name'=>'ldapGroupDisplayName',
-
'ldap_tls'=>'ldapTLS',
'ldap_nocase'=>'ldapNoCase',
'ldap_quota_def'=>'ldapQuotaDefault',
@@ -302,7 +307,9 @@ class Connection {
'ldap_turn_off_cert_check' => 'turnOffCertCheck',
'ldap_configuration_active' => 'ldapConfigurationActive',
'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
- 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch'
+ 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
+ 'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
+ 'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
);
return $array;
}
@@ -505,6 +512,10 @@ class Connection {
$configurationOK = false;
}
+ if(!empty($this->config['ldapExpertUUIDAttr'])) {
+ $this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+ }
+
return $configurationOK;
}
@@ -543,6 +554,8 @@ class Connection {
'ldap_configuration_active' => 1,
'ldap_attributes_for_user_search' => '',
'ldap_attributes_for_group_search' => '',
+ 'ldap_expert_username_attr' => '',
+ 'ldap_expert_uuid_attr' => '',
);
}
@@ -588,14 +601,13 @@ class Connection {
$error = null;
}
- $error = null;
//if LDAP server is not reachable, try the Backup (Replica!) Server
- if((!$bindStatus && ($error === -1))
+ if((!$bindStatus && ($error !== 0))
|| $this->config['ldapOverrideMainServer']
|| $this->getFromCache('overrideMainServer')) {
$this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']);
$bindStatus = $this->bind();
- if($bindStatus && $error === -1) {
+ if(!$bindStatus && $error === -1) {
//when bind to backup server succeeded and failed to main server,
//skip contacting him until next cache refresh
$this->writeToCache('overrideMainServer', true);
@@ -623,10 +635,17 @@ class Connection {
* Binds to LDAP
*/
public function bind() {
+ static $getConnectionResourceAttempt = false;
if(!$this->config['ldapConfigurationActive']) {
return false;
}
+ if($getConnectionResourceAttempt) {
+ $getConnectionResourceAttempt = false;
+ return false;
+ }
+ $getConnectionResourceAttempt = true;
$cr = $this->getConnectionResource();
+ $getConnectionResourceAttempt = false;
if(!is_resource($cr)) {
return false;
}
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 8bebd84c12e724df717bc4769108a54d0d5fab9c..10ed40ebd6a0ae9b618a7b17636c2b86b3d46c67 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -102,4 +102,35 @@ class Helper {
return true;
}
+
+ /**
+ * Truncate's the given mapping table
+ *
+ * @param string $mapping either 'user' or 'group'
+ * @return boolean true on success, false otherwise
+ */
+ static public function clearMapping($mapping) {
+ if($mapping === 'user') {
+ $table = '`*PREFIX*ldap_user_mapping`';
+ } else if ($mapping === 'group') {
+ $table = '`*PREFIX*ldap_group_mapping`';
+ } else {
+ return false;
+ }
+
+ if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) {
+ $query = \OCP\DB::prepare('DELETE FROM '.$table);
+ } else {
+ $query = \OCP\DB::prepare('TRUNCATE '.$table);
+ }
+
+
+ $res = $query->execute();
+
+ if(\OCP\DB::isError($res)) {
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 094d11db3d5d55681d968f077da5573dfe78ba89..60ecc0da33df57bf473a71403f14f13ec286ce7c 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -23,20 +23,22 @@
namespace OCA\user_ldap\lib;
-class Jobs {
+class Jobs extends \OC\BackgroundJob\TimedJob {
static private $groupsFromDB;
static private $groupBE;
static private $connector;
+ public function __construct(){
+ $this->interval = self::getRefreshInterval();
+ }
+
+ public function run($argument){
+ Jobs::updateGroups();
+ }
+
static public function updateGroups() {
\OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', \OCP\Util::DEBUG);
- $lastUpdate = \OCP\Config::getAppValue('user_ldap', 'bgjUpdateGroupsLastRun', 0);
- if((time() - $lastUpdate) < self::getRefreshInterval()) {
- \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – last run too fresh, aborting.', \OCP\Util::DEBUG);
- //komm runter Werner die Maurer geben ein aus
- return;
- }
$knownGroups = array_keys(self::getKnownGroups());
$actualGroups = self::getGroupBE()->getGroups();
@@ -45,7 +47,6 @@ class Jobs {
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.',
\OCP\Util::INFO);
- \OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
return;
}
@@ -53,8 +54,6 @@ class Jobs {
self::handleCreatedGroups(array_diff($actualGroups, $knownGroups));
self::handleRemovedGroups(array_diff($knownGroups, $actualGroups));
- \OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
-
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 05497ae8a3375790a9bd2530f3f46bc338a0fc27..22e2dac6d26bca29705fcb3a3f8bfdf4fe2104de 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -4,7 +4,9 @@
* ownCloud - user_ldap
*
* @author Dominik Schmidt
+ * @author Arthur Schiwon
* @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
+ * @copyright 2012-2013 Arthur Schiwon blizzz@owncloud.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index f0ee8c6b08a1be42c2c79d02086cb1125a0cfb30..972970aa3ef11445789bbb51390cffe5c35ec8f6 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -3,6 +3,7 @@
<ul>
<li><a href="#ldapSettings-1">LDAP Basic</a></li>
<li><a href="#ldapSettings-2">Advanced</a></li>
+ <li><a href="#ldapSettings-3">Expert</a></li>
</ul>
<?php if(OCP\App::isEnabled('user_webdavauth')) {
print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>');
@@ -96,6 +97,17 @@
</div>
</div>
</fieldset>
+ <fieldset id="ldapSettings-3">
+ <p><strong><?php p($l->t('Internal Username'));?></strong></p>
+ <p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.'));?></p>
+ <p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
+ <p><strong><?php p($l->t('Override UUID detection'));?></strong></p>
+ <p class="ldapIndent"><?php p($l->t('By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p>
+ <p class="ldapIndent"><label for="ldap_expert_uuid_attr"><?php p($l->t('UUID Attribute:'));?></label><input type="text" id="ldap_expert_uuid_attr" name="ldap_expert_uuid_attr" data-default="<?php p($_['ldap_expert_uuid_attr_default']); ?>" /></p>
+ <p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
+ <p class="ldapIndent"><?php p($l->t('ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage.'));?></p>
+ <p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
+ </fieldset>
<input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="http://doc.owncloud.org/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a>
</div>
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 7e5b9045df3f42064ef0e75a71ece3adc2a7c277..73cc0963182c454ef4d67c392654869b55956565 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -174,7 +174,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
foreach($this->backends as $backend) {
$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
if (is_array($backendUsers)) {
- $users = array_merge($users, $backendUsers);
+ $users = $users + $backendUsers;
}
}
return $users;
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..772e084b631c20e7bfc580bcb7a9c99ac8c76ba1
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-autentisering",
+"URL: http://" => "Nettadresse: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
+);
diff --git a/autotest.sh b/autotest.sh
index 267815e96d82e147c86c6163791bfff5028db1dc..4562b3ed08a553cea5671ccf6e9ef266a89f2afe 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -54,6 +54,22 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
);
DELIM
+cat > ./tests/autoconfig-oci.php <<DELIM
+<?php
+\$AUTOCONFIG = array (
+ 'installed' => false,
+ 'dbtype' => 'oci',
+ 'dbtableprefix' => 'oc_',
+ 'adminlogin' => 'admin',
+ 'adminpass' => 'admin',
+ 'directory' => '$BASEDIR/$DATADIR',
+ 'dbuser' => 'oc_autotest',
+ 'dbname' => 'XE',
+ 'dbhost' => 'localhost',
+ 'dbpass' => 'owncloud',
+);
+DELIM
+
function execute_tests {
echo "Setup environment for $1 testing ..."
# back to root folder
@@ -77,6 +93,30 @@ function execute_tests {
if [ "$1" == "pgsql" ] ; then
dropdb -U oc_autotest oc_autotest
fi
+ if [ "$1" == "oci" ] ; then
+ echo "drop the database"
+ sqlplus -s -l / as sysdba <<EOF
+ drop user oc_autotest cascade;
+EOF
+
+ echo "create the database"
+ sqlplus -s -l / as sysdba <<EOF
+ create user oc_autotest identified by owncloud;
+ alter user oc_autotest default tablespace users
+ temporary tablespace temp
+ quota unlimited on users;
+ grant create session
+ , create table
+ , create procedure
+ , create sequence
+ , create trigger
+ , create view
+ , create synonym
+ , alter session
+ to oc_autotest;
+ exit;
+EOF
+ fi
# copy autoconfig
cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
@@ -90,20 +130,27 @@ function execute_tests {
rm -rf coverage-html-$1
mkdir coverage-html-$1
php -f enable_all.php
- if [ "$1" == "pgsql" ] ; then
- # no coverage with pg - causes segfault on ci.tmit.eu - reason unknown
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
- else
+ if [ "$1" == "sqlite" ] ; then
+ # coverage only with sqlite - causes segfault on ci.tmit.eu - reason unknown
phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+ else
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
fi
}
#
# start test execution
#
-execute_tests "sqlite"
-execute_tests 'mysql'
-execute_tests 'pgsql'
+if [ -z "$1" ]
+ then
+ execute_tests "sqlite"
+ execute_tests 'mysql'
+ execute_tests 'pgsql'
+ # we will add oci as soon as it's stable
+ #execute_tests 'oci'
+else
+ execute_tests $1
+fi
#
# NOTES on mysql:
@@ -116,4 +163,8 @@ execute_tests 'pgsql'
# - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
# local all all trust
#
-
+# NOTES on oci:
+# - it's a pure nightmare to install Oracle on a Linux-System
+# - DON'T TRY THIS AT HOME!
+# - if you really need it: we feel sorry for you
+#
diff --git a/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
index 954e22dbd99e8c6dd7091335599abf2d10bf8003..eed4abd19220049cec9dafce3cb10b556ad3c915 100644
Binary files a/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png and b/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ
diff --git a/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
index 64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d..a618b0658666efb69a5d5b1abca91ab1f54270b3 100644
Binary files a/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png and b/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png differ
diff --git a/core/css/images/ui-bg_flat_100_ffffff_40x100.png b/core/css/images/ui-bg_flat_100_ffffff_40x100.png
index ac8b229af950c29356abf64a6c4aa894575445f0..6ebfa5026e220e8bc6f3da8cd6d278af4eaa9f96 100644
Binary files a/core/css/images/ui-bg_flat_100_ffffff_40x100.png and b/core/css/images/ui-bg_flat_100_ffffff_40x100.png differ
diff --git a/core/css/images/ui-bg_flat_10_000000_40x100.png b/core/css/images/ui-bg_flat_10_000000_40x100.png
index abdc01082bf3534eafecc5819d28c9574d44ea89..b10f59cd34249f40aeef06a75f95f536d6635803 100644
Binary files a/core/css/images/ui-bg_flat_10_000000_40x100.png and b/core/css/images/ui-bg_flat_10_000000_40x100.png differ
diff --git a/core/css/images/ui-bg_flat_35_1d2d44_40x100.png b/core/css/images/ui-bg_flat_35_1d2d44_40x100.png
index 904ef14c37d9cff5afe71ef9733141328f22ac3c..2be93e582d8f74bd666d6fed1a2810631b9f667c 100644
Binary files a/core/css/images/ui-bg_flat_35_1d2d44_40x100.png and b/core/css/images/ui-bg_flat_35_1d2d44_40x100.png differ
diff --git a/core/css/images/ui-icons_1d2d44_256x240.png b/core/css/images/ui-icons_1d2d44_256x240.png
index 2a857e4da570dbcfedaecc67f4d1092ba321c0a2..1b1474b1fdf7d4229dbbed444472c2ce5370a8f2 100644
Binary files a/core/css/images/ui-icons_1d2d44_256x240.png and b/core/css/images/ui-icons_1d2d44_256x240.png differ
diff --git a/core/css/images/ui-icons_222222_256x240.png b/core/css/images/ui-icons_222222_256x240.png
index b273ff111d219c9b9a8b96d57683d0075fb7871a..82ef90aabaf90cde6a42f2baad47e63512e57d5a 100644
Binary files a/core/css/images/ui-icons_222222_256x240.png and b/core/css/images/ui-icons_222222_256x240.png differ
diff --git a/core/css/images/ui-icons_ffd27a_256x240.png b/core/css/images/ui-icons_ffd27a_256x240.png
index e117effa3dca24e7978cfc5f8b967f661e81044f..a7ac4ec6580f9c553f7933a625531dc8ebcaf2aa 100644
Binary files a/core/css/images/ui-icons_ffd27a_256x240.png and b/core/css/images/ui-icons_ffd27a_256x240.png differ
diff --git a/core/css/images/ui-icons_ffffff_256x240.png b/core/css/images/ui-icons_ffffff_256x240.png
index 42f8f992c727ddaa617da224a522e463df690387..174be7c2847da9e40c962464520a1ad408f4bdb8 100644
Binary files a/core/css/images/ui-icons_ffffff_256x240.png and b/core/css/images/ui-icons_ffffff_256x240.png differ
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..c300b031afdfd430cd6d362894663831c7e40f39
--- /dev/null
+++ b/core/css/jquery.ocdialog.css
@@ -0,0 +1,48 @@
+.oc-dialog {
+ background: white;
+ color: #333333;
+ border-radius: 3px; box-shadow: 0 0 7px #888888;
+ padding: 15px;
+ z-index: 1000;
+ font-size: 100%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ min-width: 200px;
+}
+.oc-dialog-title {
+ background: white;
+ font-weight: bold;
+ font-size: 110%;
+ margin-bottom: 10px;
+}
+.oc-dialog-content {
+ z-index: 1000;
+ background: white;
+}
+.oc-dialog-separator {
+}
+.oc-dialog-buttonrow {
+ background: white;
+ float: right;
+ position: relative;
+ bottom: 0;
+ display: block;
+ margin-top: 10px;
+}
+
+.oc-dialog-close {
+ position:absolute;
+ top:7px; right:7px;
+ height:20px; width:20px;
+ background:url('../img/actions/delete.svg') no-repeat center;
+}
+
+.oc-dialog-dim {
+ background-color: #000;
+ opacity: .20;filter:Alpha(Opacity=20);
+ z-index: 999;
+ position: absolute;
+ top: 0; left: 0;
+ width: 100%; height: 100%;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 93f2cecbfe9aa6be82b76600304f0976cb6a81a9..78671a7bc11fccc4eae6c221d561fe3d16de9525 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -382,13 +382,27 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
/* ---- DIALOGS ---- */
-#dirup {width:4%;}
-#dirtree {width:92%;}
-#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
-.filepicker_element_selected { background-color:lightblue;}
-.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;}
+#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
+#oc-dialog-filepicker-content .dirtree .home {
+ background-image:url('../img/places/home.svg');
+ background-repeat:no-repeat;
+ background-position: left center;
+}
+#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
+#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
+#oc-dialog-filepicker-content .filelist {
+ overflow-y:auto;
+ max-height: 300px;
+ background-color:white;
+ width:100%;
+}
+#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
+#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
+#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
/* ---- CATEGORIES ---- */
#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 29994747c33fb88ccca93363279cce068121d232..136d6c4b3118fbab65b3a38d21730db713005958 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,109 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="22"
- height="22"
- id="svg2406"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="add.svg">
- <metadata
- id="metadata3125">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview3123"
- showgrid="false"
- inkscape:zoom="10.727273"
- inkscape:cx="11.843286"
- inkscape:cy="14.728814"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2406" />
- <defs
- id="defs2408">
- <linearGradient
- id="linearGradient2264">
- <stop
- id="stop2266"
- style="stop-color:#d7e866;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2268"
- style="stop-color:#8cab2a;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.103895"
- y1="15.180944"
- x2="24.103895"
- y2="34.224861"
- id="linearGradient2401"
- xlink:href="#linearGradient2264"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
- <linearGradient
- id="linearGradient4222">
- <stop
- id="stop4224"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4226"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.138529"
- y1="6.5316639"
- x2="24.138529"
- y2="45.690399"
- id="linearGradient2398"
- xlink:href="#linearGradient4222"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4222"
- id="linearGradient3128"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
- x1="24.138529"
- y1="6.5316639"
- x2="24.138529"
- y2="45.690399" />
- </defs>
- <path
- inkscape:connector-curvature="0"
- style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="path2272"
- d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/>
</svg>
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
index ce7e1e6980298b86b6eb5bbf9008ea7dfb67699f..8ac5fbbd1988c713a92c47041b21b948496c9bc3 100644
Binary files a/core/img/actions/caret-dark.png and b/core/img/actions/caret-dark.png differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
index abb1dc192d228813753b156c4e370059a3408767..be45ad402bf4276409ee0c0194fad55d9ff55cf5 100644
--- a/core/img/actions/caret-dark.svg
+++ b/core/img/actions/caret-dark.svg
@@ -1,102 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="10"
- height="10"
- id="svg2403"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="caret.svg"
- inkscape:export-filename="caret.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- id="namedview3047"
- showgrid="false"
- inkscape:zoom="25.279067"
- inkscape:cx="-3.063006"
- inkscape:cy="6.0978375"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2403"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <metadata
- id="metadata15">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs2405">
- <linearGradient
- x1="11.644068"
- y1="2.4988678"
- x2="11.644068"
- y2="15.00281"
- id="linearGradient2392"
- xlink:href="#linearGradient3678"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(1.0000001,1.1920928e-8)" />
- <linearGradient
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209"
- id="linearGradient2395"
- xlink:href="#linearGradient3678"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
- <linearGradient
- id="linearGradient3678">
- <stop
- id="stop3680"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3682"
- style="stop-color:#e6e6e6;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path3768"
- d="M 1,2 5,10 9,2.011 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 1,1 5,9 9,1.011 z"
- id="path3716"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/>
</svg>
diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png
index e0ae969a943bb4932af1f95dfd1edace7c71093f..00baea9ece604554243a01bed58fbc48369dd584 100644
Binary files a/core/img/actions/caret.png and b/core/img/actions/caret.png differ
diff --git a/core/img/actions/caret.svg b/core/img/actions/caret.svg
index 7bb0c59cde23ba8b3695214426820f101bdedbce..d1ae8d60a6fe1ab641a8bbe62aa7ec552f90df57 100644
--- a/core/img/actions/caret.svg
+++ b/core/img/actions/caret.svg
@@ -1,112 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="10"
- height="10"
- id="svg2403"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="logout.svg"
- inkscape:export-filename="caret.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="800"
- id="namedview3047"
- showgrid="false"
- inkscape:zoom="25.279067"
- inkscape:cx="3.6223673"
- inkscape:cy="6.0978375"
- inkscape:window-x="0"
- inkscape:window-y="-31"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2403"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <metadata
- id="metadata15">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs2405">
- <linearGradient
- x1="11.644068"
- y1="2.4988678"
- x2="11.644068"
- y2="15.00281"
- id="linearGradient2392"
- xlink:href="#linearGradient3678"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(1.0000001,1.1920928e-8)" />
- <linearGradient
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209"
- id="linearGradient2395"
- xlink:href="#linearGradient3678"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
- <linearGradient
- id="linearGradient3678">
- <stop
- id="stop3680"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3682"
- style="stop-color:#e6e6e6;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient2993"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,-3.4210526,1.060243)"
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209" />
- </defs>
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path3023"
- d="M 1,2 5,10 9,2.011 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient2993);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 1,1 5,9 9,1.011 z"
- id="path3716"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="8.0832" gradientUnits="userSpaceOnUse" x2="8.4965" gradientTransform="matrix(1.0526 0 0 .98436 -3.4211 1.0602)" y1="-.061574" x1="8.4965">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#e6e6e6" offset="1"/>
+ </linearGradient>
+ </defs>
+ <path opacity=".5" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="url(#a)"/>
</svg>
diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png
index 671b3f4f0c1daf8bbea5eb8c8881b07e79ec3b4c..9c3a284b8baa392ffcaefb8ddc4e6d0a124aa990 100644
Binary files a/core/img/actions/clock.png and b/core/img/actions/clock.png differ
diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg
old mode 100755
new mode 100644
index 1821f474df50d8a88b205060e93fb0426f8952a3..f3fcb19031a99818d1dfd2df424ea8e420137264
--- a/core/img/actions/clock.svg
+++ b/core/img/actions/clock.svg
@@ -1,20 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
-<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419 C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505 s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
-<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456 c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146 l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
-<circle cx="49.999" cy="12.956" r="1.617"/>
-<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823 C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414 s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
-<circle cx="34.343" cy="20.301" r="1.47"/>
-<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538 c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
-<circle cx="15.536" cy="47.42" r="1.618"/>
-<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822 C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414 s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
-<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008 c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
-<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005 c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
-<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618 C49.104,83.498,48.385,82.775,48.382,81.884z"/>
-<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823 c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414 c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
-<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537 c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
-<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537 c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
-<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618 c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
-<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287 c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006 c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414 c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
-<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008 c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
-<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008 c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 100 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="m50 89.836c-23.389 0-42.418-19.027-42.418-42.417s19.029-42.419 42.418-42.419 42.418 19.029 42.418 42.419-19.029 42.417-42.418 42.417zm0-79.924c-20.681 0-37.506 16.826-37.506 37.508 0 20.681 16.826 37.505 37.506 37.505s37.507-16.824 37.507-37.505c0-20.683-16.826-37.508-37.507-37.508z"/>
+<path d="m50.001 49.875c-0.141 0-0.283-0.011-0.427-0.037-1.173-0.206-2.03-1.226-2.03-2.419v-17.977c0-1.355 1.1-2.456 2.456-2.456 1.355 0 2.456 1.1 2.456 2.456v4.003l5.431-14.974c0.464-1.274 1.872-1.937 3.146-1.471 1.274 0.462 1.934 1.871 1.471 3.146l-10.195 28.11c-0.357 0.985-1.29 1.619-2.308 1.619z"/>
+<circle cy="12.956" cx="49.999" r="1.617"/>
+<path d="m50 14.778c-1.006 0-1.823-0.817-1.823-1.823 0-1.005 0.817-1.823 1.823-1.823 1.004 0 1.821 0.817 1.821 1.823s-0.817 1.823-1.821 1.823zm0-3.236c-0.779 0-1.414 0.635-1.414 1.413 0 0.779 0.635 1.414 1.414 1.414s1.412-0.635 1.412-1.414c0-0.778-0.633-1.413-1.412-1.413z"/>
+<circle cy="20.301" cx="34.343" r="1.47"/>
+<path d="m23.617 30.488c0.703 0.409 0.945 1.305 0.537 2.008-0.405 0.704-1.305 0.947-2.007 0.538-0.703-0.403-0.945-1.305-0.539-2.008 0.408-0.701 1.305-0.941 2.009-0.538z"/>
+<circle cy="47.42" cx="15.536" r="1.618"/>
+<path d="m15.536 49.242c-1.006 0-1.823-0.817-1.823-1.823 0.001-1 0.819-1.819 1.823-1.822 1.006 0 1.823 0.817 1.823 1.822 0 1.006-0.817 1.823-1.823 1.823zm0-3.236c-0.777 0.003-1.412 0.636-1.414 1.413 0 0.779 0.635 1.414 1.414 1.414s1.413-0.635 1.413-1.414c0-0.778-0.634-1.413-1.413-1.413z"/>
+<path d="m22.147 61.803c0.705-0.406 1.602-0.167 2.007 0.537 0.408 0.703 0.166 1.602-0.537 2.008-0.704 0.406-1.604 0.163-2.008-0.537-0.407-0.707-0.162-1.602 0.538-2.008z"/>
+<path d="m33.07 73.803c0.408-0.706 1.305-0.946 2.008-0.537 0.704 0.403 0.945 1.302 0.538 2.005-0.405 0.704-1.307 0.947-2.007 0.537-0.705-0.406-0.942-1.301-0.539-2.005z"/>
+<path d="m48.382 81.884c0-0.896 0.725-1.618 1.618-1.618 0.892-0.003 1.618 0.723 1.618 1.618 0 0.892-0.728 1.618-1.618 1.618-0.896-0.004-1.615-0.727-1.618-1.618z"/>
+<path d="m50 83.706c-1.002-0.003-1.819-0.82-1.823-1.822 0-1.006 0.817-1.823 1.823-1.823 1.007 0 1.822 0.817 1.822 1.823 0 1.005-0.816 1.822-1.822 1.822zm0.006-3.236c-0.785 0-1.42 0.635-1.42 1.414 0.003 0.775 0.637 1.41 1.414 1.413 0.78 0 1.413-0.635 1.413-1.413 0-0.78-0.631-1.414-1.407-1.414z"/>
+<path d="m64.385 75.271c-0.408-0.703-0.167-1.602 0.537-2.005 0.702-0.409 1.601-0.169 2.008 0.537 0.406 0.7 0.163 1.603-0.539 2.005-0.705 0.406-1.6 0.163-2.006-0.537z"/>
+<path d="m76.384 64.348c-0.704-0.406-0.945-1.305-0.537-2.008 0.402-0.704 1.301-0.943 2.006-0.537 0.704 0.402 0.945 1.308 0.539 2.008-0.412 0.7-1.305 0.94-2.008 0.537z"/>
+<path d="m84.464 49.038c-0.896-0.003-1.618-0.726-1.618-1.618-0.001-0.892 0.723-1.618 1.618-1.618 0.893-0.003 1.618 0.726 1.618 1.618-0.005 0.895-0.726 1.614-1.618 1.618z"/>
+<path d="m84.464 49.242c-1.006-0.003-1.822-0.822-1.822-1.823-0.002-0.486 0.188-0.943 0.532-1.287 0.344-0.345 0.803-0.535 1.29-0.535 1.007 0 1.822 0.817 1.822 1.822-0.004 1.003-0.823 1.82-1.822 1.823zm0.007-3.236c-0.386 0-0.74 0.147-1.008 0.416-0.267 0.267-0.412 0.621-0.412 0.998 0 0.777 0.635 1.41 1.413 1.414 0.775-0.003 1.408-0.638 1.413-1.415 0-0.778-0.631-1.413-1.406-1.413z"/>
+<path d="m77.853 33.034c-0.705 0.409-1.604 0.166-2.006-0.538-0.408-0.7-0.168-1.599 0.537-2.008 0.701-0.406 1.604-0.163 2.008 0.537 0.403 0.707 0.161 1.602-0.539 2.009z"/>
+<path d="m66.93 21.036c-0.407 0.704-1.308 0.943-2.008 0.537-0.704-0.403-0.945-1.305-0.537-2.008 0.404-0.703 1.306-0.943 2.006-0.537 0.704 0.409 0.942 1.305 0.539 2.008z"/>
+</svg>
diff --git a/core/img/actions/close.png b/core/img/actions/close.png
index bc0c782882deaa4f9ecf1676592ddba0cc9aacbc..0d8c89a56e2d88463f52bb1901ccf228640ff7a1 100644
Binary files a/core/img/actions/close.png and b/core/img/actions/close.png differ
diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
index 6a6d98e34ad84113dedfa7b5984ffaa8128622d9..ef564bfd482292f589ad750827209a6b1580fd99 100644
--- a/core/img/actions/close.svg
+++ b/core/img/actions/close.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="close.svg"
- inkscape:export-filename="close.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.67268"
- inkscape:cx="11.940651"
- inkscape:cy="15.685139"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 3,1040.3622 1,-1 4,3 4,-3 1,1 -3,4 3,4 -1,1 -4,-3 -4,3 -1,-1 3,-4 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
+ </g>
</svg>
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
index 08b15510d926eaddb2c59558120a8d0166c58486..048d91cee5143ce826ef9ef3d7619d835bce0877 100644
Binary files a/core/img/actions/delete-hover.png and b/core/img/actions/delete-hover.png differ
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
index 63cacd5e38e584b0afaee2265b273ab3a8063755..3e8d26c9786d16addcd5df03219d712356c1e09b 100644
--- a/core/img/actions/delete-hover.svg
+++ b/core/img/actions/delete-hover.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="delete.svg"
- inkscape:export-filename="delete-hover.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.67268"
- inkscape:cx="11.940651"
- inkscape:cy="15.685139"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#d40000;fill-opacity:1;stroke:none"
- d="m 3,1040.3622 1,-1 4,3 4,-3 1,1 -3,4 3,4 -1,1 -4,-3 -4,3 -1,-1 3,-4 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z" fill="#d40000"/>
+ </g>
</svg>
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index 86c8317d01da333608489b0b8ee708d524cd3747..ef564bfd482292f589ad750827209a6b1580fd99 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,70 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="delete.svg">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="25.345359"
- inkscape:cx="1.5609441"
- inkscape:cy="8.3505321"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 3,1040.3622 1,-1 4,3 4,-3 1,1 -3,4 3,4 -1,1 -4,-3 -4,3 -1,-1 3,-4 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
+ </g>
</svg>
diff --git a/core/img/actions/download.svg b/core/img/actions/download.svg
index 107a46f07bf454ba25915bb6179dec0a966f6797..a469c3b8a00e9620fc5439830ea581a425281efb 100644
--- a/core/img/actions/download.svg
+++ b/core/img/actions/download.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="download.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 6,1037.3622 4,0 1,7 4,0 -7,7 -7,-7 4,0 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m6 1037.4h4l1 7h4l-7 7-7-7h4z"/>
+ </g>
</svg>
diff --git a/core/img/actions/history.png b/core/img/actions/history.png
index 1d138b8cd5a9e77806a4395bcc78e68eb2b68d7d..3234880b25ab2efa68f9ef244876eb37d17673de 100644
Binary files a/core/img/actions/history.png and b/core/img/actions/history.png differ
diff --git a/core/img/actions/history.svg b/core/img/actions/history.svg
index 9c2838d565b6a93f399581c3ff3272a5b6747649..94512a2d431deae94f7607fa29c8b5499f9955b7 100644
--- a/core/img/actions/history.svg
+++ b/core/img/actions/history.svg
@@ -1,240 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="17"
- height="17"
- id="svg3972"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="backup.svg"
- inkscape:export-filename="/home/ronny/persoenliches/Programme/JBackpack/jbackpack/src/ch/fhnw/jbackpack/icons/16x16/icon.png"
- inkscape:export-xdpi="2.8099999"
- inkscape:export-ydpi="2.8099999">
- <defs
- id="defs3974">
- <linearGradient
- id="linearGradient3820">
- <stop
- style="stop-color:#7399ab;stop-opacity:1;"
- offset="0"
- id="stop3822" />
- <stop
- style="stop-color:#fffeff;stop-opacity:1;"
- offset="1"
- id="stop3824" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient5144">
- <stop
- style="stop-color:#ab7392;stop-opacity:1;"
- offset="0"
- id="stop5146" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.02909091"
- offset="1"
- id="stop5148" />
- </linearGradient>
- <linearGradient
- id="linearGradient5130">
- <stop
- id="stop5140"
- offset="0"
- style="stop-color:#a08f82;stop-opacity:0.74901961;" />
- <stop
- id="stop5138"
- offset="0.5"
- style="stop-color:#ab7392;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#ab7392;stop-opacity:0;"
- offset="1"
- id="stop5134" />
- </linearGradient>
- <linearGradient
- id="linearGradient4519"
- osb:paint="gradient">
- <stop
- style="stop-color:#5d879d;stop-opacity:1;"
- offset="0"
- id="stop4521" />
- <stop
- style="stop-color:#5d879d;stop-opacity:0;"
- offset="1"
- id="stop4523" />
- </linearGradient>
- <filter
- id="filter4697"
- inkscape:label="Drop shadow"
- width="1.5"
- height="1.5"
- x="-0.25"
- y="-0.25"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur4699"
- in="SourceAlpha"
- stdDeviation="2"
- result="blur" />
- <feColorMatrix
- id="feColorMatrix4701"
- result="bluralpha"
- type="matrix"
- values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0 " />
- <feOffset
- id="feOffset4703"
- in="bluralpha"
- dx="4"
- dy="4"
- result="offsetBlur" />
- <feMerge
- id="feMerge4705">
- <feMergeNode
- id="feMergeNode4707"
- in="offsetBlur" />
- <feMergeNode
- id="feMergeNode4709"
- in="SourceGraphic" />
- </feMerge>
- </filter>
- <filter
- id="filter5086"
- inkscape:label="Drop shadow"
- width="1.5"
- height="1.5"
- x="-0.25"
- y="-0.25"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5088"
- in="SourceAlpha"
- stdDeviation="5"
- result="blur" />
- <feColorMatrix
- id="feColorMatrix5090"
- result="bluralpha"
- type="matrix"
- values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0 " />
- <feOffset
- id="feOffset5092"
- in="bluralpha"
- dx="10"
- dy="10"
- result="offsetBlur" />
- <feMerge
- id="feMerge5094">
- <feMergeNode
- id="feMergeNode5096"
- in="offsetBlur" />
- <feMergeNode
- id="feMergeNode5098"
- in="SourceGraphic" />
- </feMerge>
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5130"
- id="linearGradient5136"
- x1="119.76609"
- y1="431.36642"
- x2="631.76611"
- y2="431.36642"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5144"
- id="radialGradient5150"
- cx="294.02567"
- cy="300.53604"
- fx="294.02567"
- fy="300.53604"
- r="183.84033"
- gradientTransform="matrix(0.66691196,0.43225768,-0.44145763,0.68110633,230.61036,-24.143353)"
- gradientUnits="userSpaceOnUse" />
- <filter
- inkscape:collect="always"
- id="filter4381"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="2.5"
- id="feGaussianBlur4383" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3820"
- id="linearGradient3575"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.06875313,0,0,0.06875313,2.829762,444.82336)"
- x1="339.43503"
- y1="370.08636"
- x2="66.978798"
- y2="135.09288" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="45.254834"
- inkscape:cx="12.081283"
- inkscape:cy="8.5032287"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1920"
- inkscape:window-height="1033"
- inkscape:window-x="-3"
- inkscape:window-y="-3"
- inkscape:window-maximized="1"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0">
- <inkscape:grid
- type="xygrid"
- id="grid4447"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3977">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Ebene 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(93.42207,-466.65551)">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
- d="m -83.896989,468.73997 c -3.950245,0 -6.534942,3.44694 -6.364259,6.72133 l -2.160822,0 3.904021,3.91738 4.081269,-3.87222 -2.148938,0 c -0.237051,-1.70092 1.163456,-3.1145 2.688727,-3.0921 1.596496,0.0235 2.800571,1.22922 2.800571,2.73336 0.08961,1.59378 -1.629405,3.4279 -3.965431,2.53172 -8.3e-5,1.22806 0.0027,2.54389 0,3.76397 4.189434,0.82896 7.639781,-2.50953 7.639781,-6.25087 0,-3.56212 -2.9188,-6.45252 -6.474921,-6.45252 z"
- id="path4438"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccscccccc"
- inkscape:export-filename="/home/samtuke/owncloud/git/owncloud/core/img/actions/history.png"
- inkscape:export-xdpi="89.929733"
- inkscape:export-ydpi="89.929733" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" height="17" width="17" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(93.422 -466.66)">
+ <path d="m-83.897 468.74c-3.9502 0-6.5349 3.4469-6.3643 6.7213h-2.1608l3.904 3.9174 4.0813-3.8722h-2.1489c-0.23705-1.7009 1.1635-3.1145 2.6887-3.0921 1.5965 0.0235 2.8006 1.2292 2.8006 2.7334 0.08961 1.5938-1.6294 3.4279-3.9654 2.5317-0.000083 1.2281 0.0027 2.5439 0 3.764 4.1894 0.82896 7.6398-2.5095 7.6398-6.2509 0-3.5621-2.9188-6.4525-6.4749-6.4525z"/>
+ </g>
</svg>
diff --git a/core/img/actions/info.svg b/core/img/actions/info.svg
index 1e07aed85271c6ae91ce3fa360127ff1e0404f23..55bdb17f2e1f6764613922bc1427e70dab1e639e 100644
--- a/core/img/actions/info.svg
+++ b/core/img/actions/info.svg
@@ -1,1758 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="users.svg"
- inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/users.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="14.025105"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="20.074369"
- x2="14.152531"
- y1="-1.4095211"
- x1="14.501121"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3437"
- xlink:href="#linearGradient3587-6-5-19"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="28.776533"
- x2="0.44923753"
- y1="13.895414"
- x1="0.86849999"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3456"
- xlink:href="#linearGradient3587-6-5-4"
- inkscape:collect="always" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <g
- id="g4314"
- transform="matrix(1.0000288,0,0,1,-0.14973031,7.5119235e-7)">
- <path
- d="M 5.149582,8.4745445 C 5.3049331,8.8555559 5.4749951,9.1626038 5.7940692,8.7203676 6.2006678,8.4518873 7.5528003,7.2925123 7.4556978,8.3783304 7.0875579,10.395217 6.6215241,12.395026 6.2845924,14.416813 5.892954,15.532242 6.9195772,16.485144 7.9224991,15.729405 9.0003636,15.226276 9.9139828,14.440939 10.850418,13.716521 10.706075,13.39458 10.599944,12.928009 10.253582,13.370754 9.7853152,13.60987 8.7844663,14.688222 8.5572925,13.841548 8.8726653,11.661003 9.5328233,9.5467073 9.9227187,7.3804227 10.320459,6.3755023 9.5582449,5.1570833 8.5229975,6.0170334 7.266481,6.6343485 6.2334577,7.6013759 5.149582,8.4745445 z M 9.6088759,1.0026758 C 8.3013694,0.98534052 7.7033019,3.148247 8.9661979,3.6822119 9.9886006,4.0601787 11.042606,2.968368 10.755649,1.9317924 10.657925,1.3899396 10.158361,0.96201137 9.6088769,1.0026758 l -1e-6,0 z"
- id="path3536-8"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
- inkscape:connector-curvature="0" />
- <path
- d="M 5.149582,7.4745451 C 5.3049334,7.8555565 5.4749951,8.1626045 5.7940689,7.7203682 6.2006672,7.4518879 7.5527994,6.292513 7.4556976,7.378331 7.0875583,9.3952173 6.6215238,11.395026 6.2845927,13.416813 5.8929541,14.532242 6.9195769,15.485145 7.9224987,14.729405 9.0003636,14.226276 9.9139826,13.440939 10.850418,12.716521 10.706076,12.394581 10.599945,11.928009 10.253583,12.370754 9.7853157,12.60987 8.784467,13.688222 8.5572925,12.841549 8.872666,10.661003 9.5328233,8.5467079 9.9227188,6.3804233 10.32046,5.3755029 9.5582457,4.1570839 8.5229973,5.017034 7.2664804,5.6343492 6.2334583,6.6013765 5.149582,7.4745451 z M 9.6088764,0.00267653 C 8.3013697,-0.01465929 7.7033021,2.1482476 8.9661977,2.6822125 9.9886009,3.0601794 11.042605,1.9683686 10.755649,0.93179313 10.657922,0.38994033 10.158361,-0.03798791 9.6088774,0.00267653 l -1e-6,0 z"
- id="path3536"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;opacity:0.7;fill:url(#linearGradient3456);fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
- inkscape:connector-curvature="0" />
- </g>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="28.777" gradientUnits="userSpaceOnUse" y1="13.895" gradientTransform="matrix(1.0345 0 0 1.0345 8.0708 -14.514)" x2=".44924" x1=".86850">
+ <stop offset="0"/>
+ <stop stop-color="#363636" offset="1"/>
+ </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g transform="translate(-.14973 7.5119e-7)">
+ <path opacity=".6" d="m5.1496 8.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0167-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.01736-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.5419-0.598-0.96979-1.1471-0.9291h-0.000001z" fill="#fff"/>
+ <path opacity=".7" d="m5.1496 7.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0169-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.54186-0.598-0.96979-1.1471-0.92912h-0.000001z" fill="url(#a)"/>
+ </g>
</svg>
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
index 511bfa615bb4b28755140658d0f868cb3fe411ec..dbcffa3990f7dace24aaae6836977a142d57fe47 100644
Binary files a/core/img/actions/lock.png and b/core/img/actions/lock.png differ
diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg
old mode 100755
new mode 100644
index 8fb039b9e3bfda809ed00b3b36e755291315641f..beef1d3ad3a2dca0945948e87ca4e969e1e04707
--- a/core/img/actions/lock.svg
+++ b/core/img/actions/lock.svg
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="16px" height="16px" viewBox="0 0 71 100" xml:space="preserve">
-<path d="M65.5,45V30c0-16.542-13.458-30-30-30s-30,13.458-30,30v15H0v55h71V45H65.5z M13.5,30c0-12.131,9.869-22,22-22
- s22,9.869,22,22v15h-44V30z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 71 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="m65.5 45v-15c0-16.542-13.458-30-30-30s-30 13.458-30 30v15h-5.5v55h71v-55h-5.5zm-52-15c0-12.131 9.869-22 22-22s22 9.869 22 22v15h-44v-15z"/>
+</svg>
diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index e2f4b7af12ef73d2b72006d461bbd731f7cf0410..e9c89a15a7a396afe0e597fd8934709ca970ce7d 100644
Binary files a/core/img/actions/logout.png and b/core/img/actions/logout.png differ
diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg
index e5edc24895d051daf3a5e7da66d385384f3092e1..59543875d750916c75e17a76afe187ed7221ae96 100644
--- a/core/img/actions/logout.svg
+++ b/core/img/actions/logout.svg
@@ -1,178 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg2403"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="logout.svg"
- inkscape:export-filename="logout.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview3047"
- showgrid="false"
- inkscape:zoom="25.279067"
- inkscape:cx="-1.6512429"
- inkscape:cy="6.4537904"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2403" />
- <metadata
- id="metadata15">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs2405">
- <linearGradient
- x1="11.644068"
- y1="2.4988678"
- x2="11.644068"
- y2="15.00281"
- id="linearGradient2392"
- xlink:href="#linearGradient3678"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(1.0000001,1.1920928e-8)" />
- <linearGradient
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209"
- id="linearGradient2395"
- xlink:href="#linearGradient3678"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)" />
- <linearGradient
- id="linearGradient3678">
- <stop
- id="stop3680"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3682"
- style="stop-color:#e6e6e6;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3879"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3908"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(1.0000001,1.1920928e-8)"
- x1="11.644068"
- y1="2.4988678"
- x2="11.644068"
- y2="15.00281" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3914"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3916"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(1.0000001,1.1920928e-8)"
- x1="11.644068"
- y1="2.4988678"
- x2="11.644068"
- y2="15.00281" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3919"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(1.0000001,1.1920928e-8)"
- x1="11.644068"
- y1="2.4988678"
- x2="11.644068"
- y2="15.00281" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3922"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="8.083209" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3925"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="15.216674" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3942"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,-0.42098964,0.06024281)"
- x1="8.4964771"
- y1="-0.061573759"
- x2="8.4964771"
- y2="15.216674" />
- </defs>
- <path
- sodipodi:nodetypes="sccsccsccssscscssscscc"
- inkscape:connector-curvature="0"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 8.0000634,0 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,12.733393 4.5611725,15 7.9688134,15 11.327833,15 13.846204,12.850562 14.687563,10.21875 15.528922,7.5869378 14.630363,4.3955638 11.562563,2.625 11.128957,2.3713639 10.503661,2.535122 10.250038,2.9687356 9.9964154,3.4023491 10.160192,4.0276401 10.593813,4.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,7.5564313 3.0469519,5.451888 5.2813134,4.28125 5.6599659,4.0748887 5.8603711,3.5887067 5.7371222,3.1754605 5.6138734,2.7622144 5.1798937,2.4652349 4.7500634,2.5 4.7188384,2.49846 4.6875384,2.49846 4.6563134,2.5 z"
- id="path3781" />
- <path
- id="path3927"
- d="m 8.0000634,1 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,13.733393 4.5611725,16 7.9688134,16 11.327833,16 13.846204,13.850562 14.687563,11.21875 15.528922,8.5869378 14.630363,5.3955638 11.562563,3.625 11.128957,3.3713639 10.503661,3.535122 10.250038,3.9687356 9.9964154,4.4023491 10.160192,5.0276401 10.593813,5.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,8.5564313 3.0469519,6.451888 5.2813134,5.28125 5.6599659,5.0748887 5.8603711,4.5887067 5.7371222,4.1754605 5.6138734,3.7622144 5.1798937,3.4652349 4.7500634,3.5 4.7188384,3.49846 4.6875384,3.49846 4.6563134,3.5 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sccsccsccssscscssscscc" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0001 0c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9435-0.047-4.048 2.1873-5.2187 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0001 1c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9436-0.047-4.0481 2.1873-5.2188 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z" fill="#fff"/>
</svg>
diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
index e82fa3b4677c9b1a8cdc49e2458bf20a44d55311..2c63daac03440c9003f7ac8fc7b5b60ff46e826c 100644
--- a/core/img/actions/mail.svg
+++ b/core/img/actions/mail.svg
@@ -1,58 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- version="1.1"
- width="16"
- height="16"
- id="svg2985">
- <defs
- id="defs2987">
- <linearGradient
- id="linearGradient3767">
- <stop
- id="stop3769"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3771"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- </defs>
- <metadata
- id="metadata2990">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1">
- <rect
- width="15.243872"
- height="10.243872"
- x="0.37806413"
- y="2.6280646"
- id="rect2995"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75612825;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <path
- d="M -0.6,11 8,6 l 8.6,5"
- id="path3765"
- style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- d="M 0,2.5 8,9 16,2.5"
- id="path3775"
- style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g>
+ <rect stroke-linejoin="round" height="10.244" width="15.244" stroke="#000" stroke-linecap="square" y="2.6281" x=".37806" stroke-width=".75613"/>
+ <path d="m-0.6 11 8.6-5l8.6 5" stroke="#fff" stroke-width="1px" fill="none"/>
+ <path d="m0 2.5 8 6.5 8-6.5" stroke="#fff" stroke-linecap="round" stroke-width="1px"/>
+ </g>
</svg>
diff --git a/core/img/actions/password.png b/core/img/actions/password.png
index 5167161dfa9906bb6e822dd849bc94328800feee..edcafdd9bbfb7b6c11f12e9b93f2be87ad1e282c 100644
Binary files a/core/img/actions/password.png and b/core/img/actions/password.png differ
diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg
index ee6a9fe01829da4c559d93d4cd9d6b2499a16fcb..9ab5d4243d92e0c38040b957de7957f686973c88 100644
--- a/core/img/actions/password.svg
+++ b/core/img/actions/password.svg
@@ -1,2148 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="password.svg"
- inkscape:export-filename="password.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="16.000001"
- inkscape:cx="-1.1375545"
- inkscape:cy="5.0070539"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4566-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- id="linearGradient3587-6-5-26">
- <stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- id="linearGradient4580-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6-3" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-2-1">
- <stop
- id="stop3589-9-2-8-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="1013.451"
- x2="209.34245"
- y1="998.45801"
- x1="209.34245"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3528"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- id="linearGradient3335-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-4">
- <stop
- id="stop3589-9-2-8-7-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-6"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3567"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5021-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-3">
- <stop
- id="stop3589-9-2-67-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5018-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3584">
- <stop
- id="stop3586"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3588"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5015-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3591">
- <stop
- id="stop3593"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3595"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5012-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3598">
- <stop
- id="stop3600"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3602"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4638"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4640"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4642"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4644"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4656"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4659"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4661"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4663"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4665"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-3-9">
- <stop
- id="stop3589-9-2-67-4-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-9-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- id="linearGradient4661-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4682">
- <stop
- id="stop4684"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4686"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4689">
- <stop
- id="stop4691"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4693"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- id="linearGradient4665-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4696">
- <stop
- id="stop4698"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4700"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="19.490837"
- x2="26.045763"
- y1="9.6223383"
- x1="26.045763"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4707"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4823"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4825"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4827"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4829"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient3717"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient3719"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient3721"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient3723"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;opacity:1"
- d="M 3 6 C 1.8954305 6 1 6.8954305 1 8 C 1 9.1045695 1.8954305 10 3 10 C 4.1045695 10 5 9.1045695 5 8 C 5 6.8954305 4.1045695 6 3 6 z M 8 6 C 6.8954305 6 6 6.8954305 6 8 C 6 9.1045695 6.8954305 10 8 10 C 9.1045695 10 10 9.1045695 10 8 C 10 6.8954305 9.1045695 6 8 6 z M 13 6 C 11.895431 6 11 6.8954305 11 8 C 11 9.1045695 11.895431 10 13 10 C 14.104569 10 15 9.1045695 15 8 C 15 6.8954305 14.104569 6 13 6 z "
- id="path3750" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path d="m3 6c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.105 0-2 0.8954-2 2s0.895 2 2 2 2-0.8954 2-2-0.895-2-2-2z" fill-rule="evenodd"/>
</svg>
diff --git a/core/img/actions/pause-big.svg b/core/img/actions/pause-big.svg
index b521057a35cef9f29c055f380f5915ab861e287f..9c4944223ff54408fe6f80e4895fce6010ac1e9c 100644
--- a/core/img/actions/pause-big.svg
+++ b/core/img/actions/pause-big.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="play-big.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.2402344"
- inkscape:cx="110.24162"
- inkscape:cy="54.102269"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 1,1037.3622 0,14 5,0 0,-14 z m 9,0 0,14 5,0 0,-14 z"
- id="path3086-7"
- sodipodi:nodetypes="cccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m1 1037.4v14h5v-14zm9 0v14h5v-14z"/>
+ </g>
</svg>
diff --git a/core/img/actions/pause.svg b/core/img/actions/pause.svg
index ff3c69d6c71c704ea758e3aea58329118c224a3a..d572ad6f5c5a52daa8ffca7deb71dc45ab8c7f8b 100644
--- a/core/img/actions/pause.svg
+++ b/core/img/actions/pause.svg
@@ -1,72 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="play-next.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-big.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="M 3 3 L 3 13 L 7 13 L 7 3 L 3 3 z M 9 3 L 9 13 L 13 13 L 13 3 L 9 3 z "
- transform="translate(0,1036.3622)"
- id="path3086" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m3 3v10h4v-10h-4zm6 0v10h4v-10h-4z" transform="translate(0 1036.4)"/>
+ </g>
</svg>
diff --git a/core/img/actions/play-add.svg b/core/img/actions/play-add.svg
index 25ff0b57eee76312ddfe1547b0af797157d518b9..cdf4f6ea9f3bbba59f4698e6a4102d1cef05812f 100644
--- a/core/img/actions/play-add.svg
+++ b/core/img/actions/play-add.svg
@@ -1,83 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="play-add.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="25.345359"
- inkscape:cx="2.4224415"
- inkscape:cy="8.0693339"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <g
- id="g4806"
- style="fill:#000000;fill-opacity:1">
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path3086"
- d="m 2,1037.3622 11,6 -11,6 z"
- style="fill:#000000;fill-opacity:1;stroke:none" />
- <path
- sodipodi:nodetypes="ccccccccccccc"
- id="rect2984"
- d="m 11,1045.3622 0,2 -2,0 0,2 2,0 0,2 2,0 0,-2 2,0 0,-2 -2,0 0,-2 z"
- style="fill:#000000;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <g>
+ <path d="m2 1037.4 11 6-11 6z"/>
+ <path d="m11 1045.4v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/>
</g>
+ </g>
</svg>
diff --git a/core/img/actions/play-big.svg b/core/img/actions/play-big.svg
index 2ef67415323bd115ce2d60993e160bfc4ce059bf..884171ced853f8c9c252f9bcbb51e8dc3852aacf 100644
--- a/core/img/actions/play-big.svg
+++ b/core/img/actions/play-big.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="play.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 0,1036.3622 16,8 -16,8 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m0 1036.4 16 8-16 8z"/>
+ </g>
</svg>
diff --git a/core/img/actions/play-next.svg b/core/img/actions/play-next.svg
index 9a41e4bd9d088db119c0e0930646f167361b37b1..8b3d7d6effcba0a27e02d77642e7835d63353fed 100644
--- a/core/img/actions/play-next.svg
+++ b/core/img/actions/play-next.svg
@@ -1,79 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="play-big.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-big.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 7,1038.3622 7,6 -7,6 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 2,1038.3622 7,6 -7,6 z"
- id="path3086-5"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m7 1038.4 7 6-7 6z"/>
+ <path d="m2 1038.4 7 6-7 6z"/>
+ </g>
</svg>
diff --git a/core/img/actions/play-previous.svg b/core/img/actions/play-previous.svg
index 31d45dedb4df5cd0792f78416366810d2f2e1938..6210b088cb8fa2bf59f96b6643b5eba75a9c7f85 100644
--- a/core/img/actions/play-previous.svg
+++ b/core/img/actions/play-previous.svg
@@ -1,79 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="next.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-next.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 9,1038.3622 -7,6 7,6 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 14,1038.3622 -7,6 7,6 z"
- id="path3086-5"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m9 1038.4-7 6 7 6z"/>
+ <path d="m14 1038.4-7 6 7 6z"/>
+ </g>
</svg>
diff --git a/core/img/actions/play.svg b/core/img/actions/play.svg
index 7bb7b5c262a2d7f1e407250587d521fd5b1ef8ad..ae23e6a0d263d7a14a63ee21fa9937cb7c9b2a61 100644
--- a/core/img/actions/play.svg
+++ b/core/img/actions/play.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="play.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 2,1038.3622 12,6 -12,6 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m2 1038.4 12 6-12 6z"/>
+ </g>
</svg>
diff --git a/core/img/actions/public.svg b/core/img/actions/public.svg
index b47305fbd086f41304f9f75fd64f84d40ccc90e1..c70a76277884125223ec3f902093efb0c41499d6 100644
--- a/core/img/actions/public.svg
+++ b/core/img/actions/public.svg
@@ -1,292 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg2457"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="world.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata23">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview21"
- showgrid="false"
- inkscape:zoom="17.875"
- inkscape:cx="-12.837249"
- inkscape:cy="5.7622378"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2457" />
- <defs
- id="defs2459">
- <linearGradient
- id="linearGradient5128">
- <stop
- id="stop5130"
- style="stop-color:#e5e5e5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop5132"
- style="stop-color:#ababab;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="86.132919"
- y1="105.105"
- x2="84.63858"
- y2="20.895"
- id="linearGradient3260"
- xlink:href="#linearGradient5128"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(9.6142312e-2,0,0,9.6142312e-2,1.8468935,1.9430362)" />
- <linearGradient
- id="linearGradient3397">
- <stop
- id="stop3399"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3401"
- style="stop-color:#8c8c8c;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21"
- y1="0"
- x2="21"
- y2="16.004715"
- id="linearGradient3264"
- xlink:href="#linearGradient3397"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,0)" />
- <linearGradient
- x1="63.9995"
- y1="3.1001"
- x2="63.9995"
- y2="122.8994"
- id="linearGradient3309"
- gradientUnits="userSpaceOnUse">
- <stop
- id="stop3311"
- style="stop-color:#f6f6f6;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3313"
- style="stop-color:#cccccc;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105"
- id="linearGradient3262"
- xlink:href="#linearGradient3309"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,0)" />
- <linearGradient
- id="linearGradient3678">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3680" />
- <stop
- style="stop-color:#e6e6e6;stop-opacity:1;"
- offset="1"
- id="stop3682" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3309-5"
- id="linearGradient3066-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,0)"
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105" />
- <linearGradient
- x1="63.9995"
- y1="3.1001"
- x2="63.9995"
- y2="122.8994"
- id="linearGradient3309-5"
- gradientUnits="userSpaceOnUse">
- <stop
- id="stop3311-3"
- style="stop-color:#f6f6f6;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3313-3"
- style="stop-color:#cccccc;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3920"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,-0.444)"
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678-0"
- id="linearGradient3920-6"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,-0.444)"
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105" />
- <linearGradient
- id="linearGradient3678-0">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3680-5" />
- <stop
- style="stop-color:#e6e6e6;stop-opacity:1;"
- offset="1"
- id="stop3682-7" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3784"
- x1="0.5"
- y1="7.5560002"
- x2="15.5"
- y2="7.5560002"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3810"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)"
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3813"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,10.462268,-5.974418)"
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3816"
- gradientUnits="userSpaceOnUse"
- x1="7.4930072"
- y1="0.0035526801"
- x2="7.4930072"
- y2="14.998127" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3798"
- x1="8.8461542"
- y1="0.89504272"
- x2="8.8461542"
- y2="15.048951"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7-2"
- id="linearGradient3798-6"
- x1="8.8461542"
- y1="0.89504272"
- x2="8.8461542"
- y2="15.048951"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7-2">
- <stop
- id="stop3589-9-2-2-6-2-9"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- gradientTransform="translate(-1,-1)"
- y2="15.048951"
- x2="8.8461542"
- y1="0.89504272"
- x1="8.8461542"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3815"
- xlink:href="#linearGradient3587-6-5-3-5-7-2"
- inkscape:collect="always" />
- </defs>
- <path
- inkscape:connector-curvature="0"
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none"
- d="M 8,1 C 4.1340071,1 1,4.134007 1,7.9999999 1,11.865994 4.1340071,15 8,15 11.865994,15 15,11.865994 15,7.9999999 15,4.134007 11.865994,1 8,1 z m 0.8020833,0.8932295 c 1.2010717,0.026708 2.2624547,0.7482116 3.3359377,1.2213541 L 13.869792,5.511719 13.596354,6.5416669 14.125,6.8697919 14.1159,8.0911458 c -0.0121,0.349374 0.005,0.6992101 -0.0091,1.048177 -0.166346,0.6623539 -0.550627,1.2665712 -0.875,1.8684892 -0.219888,0.108406 0.02005,-0.7185 -0.11849,-0.97526 C 13.14504,9.4386408 12.642422,9.4660089 12.302112,9.7955727 11.881413,10.041226 10.955977,10.114914 10.92581,9.4492183 10.687264,8.6490761 10.891165,7.7966268 11.217384,7.0520835 L 10.679623,6.3958335 10.87103,4.7096354 10.014259,3.8437502 10.21478,2.8958336 9.2121752,2.3307295 C 9.0145444,2.1755339 8.6384357,2.114115 8.5559252,1.902344 8.6372992,1.897654 8.7219474,1.891447 8.8020189,1.893224 z m -2.4609375,0.00912 c 0.031442,0.00459 0.069992,0.026431 0.1276042,0.072917 C 6.8067806,2.1608975 6.3863479,2.3716106 6.2864583,2.5677086 5.7466682,2.9328038 6.4524911,3.2318365 6.6875,3.5247398 7.0642392,3.4164892 7.4410308,2.8779535 7.9908854,3.0416669 8.6942527,2.8222093 8.5821719,3.630807 8.984375,3.9895836 9.036567,4.1585309 9.8643709,4.7080895 9.3671875,4.5273437 8.9577408,4.2098855 8.5022772,4.2337911 8.2096354,4.6914062 7.4187262,5.1199798 7.8867869,3.8662153 7.5078125,3.5611981 6.9348738,2.9219861 7.1750002,4.0387484 7.1067708,4.3723957 6.7342944,4.364267 6.0387231,4.0858224 5.6575521,4.5364583 L 6.03125,5.1471356 6.4778646,4.4635416 C 6.5864179,4.2161129 6.7226128,4.6558348 6.8424479,4.736979 6.9855355,5.0129459 7.6653536,5.4804485 7.1523438,5.6119794 6.3917179,6.0339397 5.7934201,6.6737624 5.1471354,7.2434895 4.9290953,7.7034971 4.4841468,7.6508764 4.2083333,7.2708332 3.5410706,6.8603335 3.5906422,7.9274218 3.625,8.3281249 l 0.5833333,-0.3645833 0,0.6015625 C 4.19179,8.6789089 4.2058787,8.7972867 4.1992147,8.9114582 3.790491,9.3384813 3.3785344,8.3120287 3.0234334,8.0820311 L 2.9960896,6.5781252 C 3.0089957,6.1556005 2.9197821,5.7229754 3.0052082,5.3111981 3.8089547,4.4486619 4.6253679,3.5550749 5.1015624,2.4583336 l 0.7838542,0 C 6.4331575,2.7236662 6.1210544,1.8701843 6.3411457,1.902344 z M 5.1835938,9.722656 c 0.095099,-0.010145 0.2032823,0.011573 0.3190103,0.072921 0.7379441,0.1056226 1.289687,0.640901 1.8776042,1.048178 0.4687224,0.464525 1.4828124,0.315782 1.5950521,1.102865 -0.1706086,0.853749 -1.0104785,1.312191 -1.75,1.61328 C 7.0406658,13.662851 6.8423351,13.744732 6.6328125,13.77865 5.9471995,13.950405 5.6507787,13.2474 5.5117188,12.721359 5.2012551,12.071255 4.4254987,11.578795 4.5364583,10.779953 4.5547311,10.382752 4.7714976,9.7666104 5.1835938,9.7226607 z"
- id="path3002" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m8 1c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm0.80208 0.89323c1.2011 0.026708 2.2625 0.74821 3.3359 1.2214l1.732 2.3971-0.274 1.03 0.529 0.3281-0.009 1.2213c-0.0121 0.34937 0.005 0.69921-0.0091 1.0482-0.16635 0.66235-0.55063 1.2666-0.875 1.8685-0.21989 0.10841 0.02005-0.7185-0.11849-0.97526 0.032-0.5934-0.471-0.566-0.811-0.2364-0.421 0.2454-1.346 0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526 0.291-2.3971l-0.537-0.6563 0.191-1.6862-0.857-0.8658 0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284 0.0814-0.0046 0.166-0.0109 0.2461-0.0091zm-2.4609 0.00912c0.031442 0.00459 0.069992 0.026431 0.1276 0.072917 0.338 0.1857-0.0825 0.3964-0.1823 0.5925-0.5398 0.3651 0.166 0.6641 0.401 0.957 0.3767-0.1082 0.7535-0.6467 1.3034-0.483 0.7034-0.2195 0.5913 0.5891 0.9935 0.9479 0.0522 0.1689 0.88 0.7185 0.3828 0.5377-0.4095-0.3174-0.8649-0.2935-1.1576 0.1641-0.7909 0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328 0.4775-0.401 0.8112-0.3725-0.0081-1.0681-0.2866-1.4492 0.1641l0.3736 0.6106 0.4467-0.6836c0.1085-0.2474 0.2447 0.1923 0.3645 0.2735 0.1431 0.2759 0.823 0.7434 0.3099 0.875-0.7606 0.4219-1.3589 1.0618-2.0052 1.6315-0.218 0.46-0.663 0.4074-0.9388 0.0273-0.6672-0.4105-0.6177 0.6566-0.5833 1.0573l0.58333-0.36458v0.60156c-0.0165 0.1138-0.0024 0.2322-0.0091 0.3464-0.4087 0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551 0.0091-1.2669 0.8038-0.8625 1.6202-1.7561 2.0964-2.8529h0.78385c0.5478 0.2654 0.2357-0.5881 0.4557-0.556zm-1.1576 7.8204c0.095099-0.010145 0.20328 0.011573 0.31901 0.072921 0.73794 0.10562 1.2897 0.6409 1.8776 1.0482 0.46872 0.46452 1.4828 0.31578 1.5951 1.1029-0.17061 0.85375-1.0105 1.3122-1.75 1.6133-0.1846 0.103-0.383 0.185-0.5925 0.219-0.6856 0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941 0.0182-0.397 0.235-1.0134 0.6471-1.0573z"/>
</svg>
diff --git a/core/img/actions/rename.svg b/core/img/actions/rename.svg
index 44b464c850f8559376e90f8b26395926a202fafa..d6779709d96b711d867f92544f07ff7798e9f94a 100644
--- a/core/img/actions/rename.svg
+++ b/core/img/actions/rename.svg
@@ -1,72 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="rename.svg"
- inkscape:export-filename="/home/jancborchardt/rename.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="8.9609376"
- inkscape:cx="13.152158"
- inkscape:cy="4.0337477"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="M 12.59375 1.34375 C 12.0625 1.3125 11.5 1.5 11 2 L 14 5 C 15.5 3.5 14.1875 1.4375 12.59375 1.34375 z M 10 3 L 3 10 L 1 15 L 6 13 L 13 6 L 10 3 z M 3.5 10.5 L 5.5 12.5 L 3 14 L 2 13 L 3.5 10.5 z "
- transform="translate(0,1036.3622)"
- id="path3086" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m12.594 1.3438c-0.532-0.0313-1.094 0.1562-1.594 0.6562l3 3c1.5-1.5 0.188-3.5625-1.406-3.6562zm-2.594 1.6562l-7 7-2 5 5-2 7-7-3-3zm-6.5 7.5l2 2-2.5 1.5-1-1 1.5-2.5z" transform="translate(0 1036.4)"/>
+ </g>
</svg>
diff --git a/core/img/actions/search.png b/core/img/actions/search.png
index 98e1d73ee3418b05bd79b285495c35784294d8ea..312e4f419e589ad575cce37e27ab3d906d733d74 100644
Binary files a/core/img/actions/search.png and b/core/img/actions/search.png differ
diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg
index c8d9d848c4673e68b21d315eba37d5cc23f2243a..4f27369dbbcbe9fc58a3c873b384aa6b35c7279a 100644
--- a/core/img/actions/search.svg
+++ b/core/img/actions/search.svg
@@ -1,1632 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="icons-single.svg"
- inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/search.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="2.8284273"
- inkscape:cx="-44.315999"
- inkscape:cy="38.30965"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg11300">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3252">
- <g
- id="layer1-4">
- <path
- inkscape:connector-curvature="0"
- style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="path3220-5"
- d="m 6,1.9992355 c -2.7614237,0 -5,2.2385763 -5,5 0,2.7614237 2.2385763,4.9999995 5,4.9999995 0.9847834,0 1.8822735,-0.289667 2.65625,-0.78125 l 4.46875,4.625 c 0.09558,0.105267 0.226186,0.164519 0.375,0.15625 0.148816,-0.0083 0.303095,-0.07119 0.40625,-0.1875 l 0.9375,-1.0625 c 0.191938,-0.220889 0.195486,-0.535924 0,-0.71875 L 10.25,9.6242355 c 0.477599,-0.7663478 0.75,-1.6555164 0.75,-2.625 0,-2.7614237 -2.2385763,-5 -5,-5 z m 0,2 c 1.6568542,0 3,1.3431458 3,3 0,1.6568542 -1.3431458,3 -3,3 -1.6568542,0 -3,-1.3431458 -3,-3 0,-1.6568542 1.3431458,-3 3,-3 z" />
- <path
- inkscape:connector-curvature="0"
- style="opacity:0.7;color:#000000;fill:url(#linearGradient3795-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="path3220"
- d="M 6,1 C 3.2385763,1 1,3.2385763 1,6 c 0,2.7614237 2.2385763,5 5,5 0.9847834,0 1.8822735,-0.289667 2.65625,-0.78125 l 4.46875,4.625 c 0.09558,0.105267 0.226186,0.164519 0.375,0.15625 0.148816,-0.0083 0.303095,-0.07119 0.40625,-0.1875 l 0.9375,-1.0625 c 0.191938,-0.220889 0.195486,-0.535924 0,-0.71875 L 10.25,8.625 C 10.727599,7.8586522 11,6.9694836 11,6 11,3.2385763 8.7614237,1 6,1 z M 6,3 C 7.6568542,3 9,4.3431458 9,6 9,7.6568542 7.6568542,9 6,9 4.3431458,9 3,7.6568542 3,6 3,4.3431458 4.3431458,3 6,3 z" />
- </g>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="38.409" gradientUnits="userSpaceOnUse" x2="46.396" gradientTransform="matrix(-.41002 0 0 .54471 28.023 -5.922)" y1="12.708" x1="46.396">
+ <stop offset="0"/>
+ <stop stop-color="#363636" offset="1"/>
+ </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+ <path opacity=".6" style="color:#000000" d="m6 1.9992c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.4068c0.4776-0.76635 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/>
+ <path opacity=".7" style="color:#000000" d="m6 1c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.406c0.478-0.7663 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#a)"/>
+ </g>
</svg>
diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
index 8b3acb00a4fa9a7d8f92a05926927ae242c0f07c..9ada3087707a6b9c2248aee03a2a42a0773d8a75 100644
Binary files a/core/img/actions/settings.png and b/core/img/actions/settings.png differ
diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg
index da685e8be0b6818909b4d896cf1848010cff65a5..bd7ae3b3d7f62586a00c71d21fbb5d26d083b6ed 100644
--- a/core/img/actions/settings.svg
+++ b/core/img/actions/settings.svg
@@ -1,270 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg2457"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="settings.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata23">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview21"
- showgrid="false"
- inkscape:zoom="17.875"
- inkscape:cx="-0.41568268"
- inkscape:cy="1.2867133"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2457" />
- <defs
- id="defs2459">
- <linearGradient
- id="linearGradient5128">
- <stop
- id="stop5130"
- style="stop-color:#e5e5e5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop5132"
- style="stop-color:#ababab;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="86.132919"
- y1="105.105"
- x2="84.63858"
- y2="20.895"
- id="linearGradient3260"
- xlink:href="#linearGradient5128"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(9.6142312e-2,0,0,9.6142312e-2,1.8468935,1.9430362)" />
- <linearGradient
- id="linearGradient3397">
- <stop
- id="stop3399"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3401"
- style="stop-color:#8c8c8c;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21"
- y1="0"
- x2="21"
- y2="16.004715"
- id="linearGradient3264"
- xlink:href="#linearGradient3397"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,0)" />
- <linearGradient
- x1="63.9995"
- y1="3.1001"
- x2="63.9995"
- y2="122.8994"
- id="linearGradient3309"
- gradientUnits="userSpaceOnUse">
- <stop
- id="stop3311"
- style="stop-color:#f6f6f6;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3313"
- style="stop-color:#cccccc;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105"
- id="linearGradient3262"
- xlink:href="#linearGradient3309"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,0)" />
- <linearGradient
- id="linearGradient3678">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3680" />
- <stop
- style="stop-color:#e6e6e6;stop-opacity:1;"
- offset="1"
- id="stop3682" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3309-5"
- id="linearGradient3066-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,0)"
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105" />
- <linearGradient
- x1="63.9995"
- y1="3.1001"
- x2="63.9995"
- y2="122.8994"
- id="linearGradient3309-5"
- gradientUnits="userSpaceOnUse">
- <stop
- id="stop3311-3"
- style="stop-color:#f6f6f6;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3313-3"
- style="stop-color:#cccccc;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678"
- id="linearGradient3920"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,-0.444)"
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3678-0"
- id="linearGradient3920-6"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-17.058189,-0.444)"
- x1="25"
- y1="0"
- x2="25"
- y2="16.000105" />
- <linearGradient
- id="linearGradient3678-0">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3680-5" />
- <stop
- style="stop-color:#e6e6e6;stop-opacity:1;"
- offset="1"
- id="stop3682-7" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3784"
- x1="0.5"
- y1="7.5560002"
- x2="15.5"
- y2="7.5560002"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3810"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)"
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3813"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,10.462268,-5.974418)"
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- id="linearGradient3816"
- gradientUnits="userSpaceOnUse"
- x1="7.4930072"
- y1="0.0035526801"
- x2="7.4930072"
- y2="14.998127" />
- </defs>
- <g
- transform="translate(0.027972,0.944)"
- id="g2479-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1">
- <path
- inkscape:connector-curvature="0"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
- id="path2426-2"
- d="M 6.9375,0.056 C 6.6890831,0.056 6.5,0.245082 6.5,0.4935 l 0,1.25 C 5.9460971,1.885701 5.448836,2.115378 4.96875,2.39975 L 4.0625,1.4935 c -0.1756569,-0.175658 -0.449342,-0.175658 -0.625,0 l -1.5,1.5 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 L 2.84375,4.52475 C 2.5593789,5.004836 2.329701,5.502097 2.1875,6.056 l -1.25,0 C 0.68908301,6.056 0.5,6.245082 0.5,6.4935 l 0,2.125 c 1e-8,0.248418 0.189083,0.4375 0.4375,0.4375 l 1.25,0 c 0.1422009,0.553903 0.371879,1.051164 0.65625,1.53125 L 1.9375,11.4935 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 l 1.5,1.5 c 0.1756579,0.175658 0.449342,0.175658 0.625,0 L 4.96875,12.71225 C 5.4488361,12.996622 5.946097,13.2263 6.5,13.3685 l 0,1.25 c 1e-7,0.248418 0.189083,0.4375 0.4375,0.4375 l 2.125,0 C 9.3109176,15.056 9.5,14.866918 9.5,14.6185 l 0,-1.25 c 0.553903,-0.1422 1.051164,-0.371878 1.53125,-0.65625 l 0.90625,0.90625 c 0.175658,0.175658 0.449342,0.175658 0.625,0 l 1.5,-1.5 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 L 13.15625,10.58725 C 13.440622,10.107164 13.6703,9.609903 13.8125,9.056 l 1.25,0 C 15.310918,9.056 15.5,8.866917 15.5,8.6185 l 0,-2.125 C 15.5,6.245082 15.310917,6.056 15.0625,6.056 l -1.25,0 C 13.6703,5.502097 13.440622,5.004836 13.15625,4.52475 L 14.0625,3.6185 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 l -1.5,-1.5 c -0.175658,-0.175658 -0.449342,-0.175658 -0.625,0 L 11.03125,2.39975 C 10.551164,2.115378 10.053903,1.885701 9.5,1.7435 l 0,-1.25 C 9.4999996,0.245082 9.310918,0.056 9.0625,0.056 z M 8,4.2133427 c 1.8451469,0 3.342657,1.4975104 3.342657,3.3426573 0,1.8451469 -1.4975101,3.342657 -3.342657,3.342657 C 6.1548531,10.898657 4.6573427,9.4011469 4.6573427,7.556 4.6573427,5.7108531 6.1548531,4.2133427 8,4.2133427 z"
- sodipodi:nodetypes="ssccssssccssssccssssccssssccssssccssssccssssccssssssss" />
- </g>
- <g
- id="g2479"
- transform="translate(0,-0.056)"
- style="fill-opacity:1;fill:url(#linearGradient3784);opacity:0.7">
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3816);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
- id="path2426"
- d="M 6.9375,0.056 C 6.6890831,0.056 6.5,0.245082 6.5,0.4935 l 0,1.25 C 5.9460971,1.885701 5.448836,2.115378 4.96875,2.39975 L 4.0625,1.4935 c -0.1756569,-0.175658 -0.449342,-0.175658 -0.625,0 l -1.5,1.5 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 L 2.84375,4.52475 C 2.5593789,5.004836 2.329701,5.502097 2.1875,6.056 l -1.25,0 C 0.68908301,6.056 0.5,6.245082 0.5,6.4935 l 0,2.125 c 1e-8,0.248418 0.189083,0.4375 0.4375,0.4375 l 1.25,0 c 0.1422009,0.553903 0.371879,1.051164 0.65625,1.53125 L 1.9375,11.4935 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 l 1.5,1.5 c 0.1756579,0.175658 0.449342,0.175658 0.625,0 L 4.96875,12.71225 C 5.4488361,12.996622 5.946097,13.2263 6.5,13.3685 l 0,1.25 c 1e-7,0.248418 0.189083,0.4375 0.4375,0.4375 l 2.125,0 C 9.3109176,15.056 9.5,14.866918 9.5,14.6185 l 0,-1.25 c 0.553903,-0.1422 1.051164,-0.371878 1.53125,-0.65625 l 0.90625,0.90625 c 0.175658,0.175658 0.449342,0.175658 0.625,0 l 1.5,-1.5 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 L 13.15625,10.58725 C 13.440622,10.107164 13.6703,9.609903 13.8125,9.056 l 1.25,0 C 15.310918,9.056 15.5,8.866917 15.5,8.6185 l 0,-2.125 C 15.5,6.245082 15.310917,6.056 15.0625,6.056 l -1.25,0 C 13.6703,5.502097 13.440622,5.004836 13.15625,4.52475 L 14.0625,3.6185 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 l -1.5,-1.5 c -0.175658,-0.175658 -0.449342,-0.175658 -0.625,0 L 11.03125,2.39975 C 10.551164,2.115378 10.053903,1.885701 9.5,1.7435 l 0,-1.25 C 9.4999996,0.245082 9.310918,0.056 9.0625,0.056 z M 8,4.2133427 c 1.8451469,0 3.342657,1.4975104 3.342657,3.3426573 0,1.8451469 -1.4975101,3.342657 -3.342657,3.342657 C 6.1548531,10.898657 4.6573427,9.4011469 4.6573427,7.556 4.6573427,5.7108531 6.1548531,4.2133427 8,4.2133427 z"
- sodipodi:nodetypes="ssccssssccssssccssssccssssccssssccssssccssssccssssssss" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="c" y2="7.556" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="15.5" y1="7.556" x1=".5"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-color="#363636" offset="1"/>
+ </linearGradient>
+ <linearGradient id="b" y2="14.998" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="7.493" y1=".0035527" x1="7.493"/>
+ </defs>
+ <g opacity=".6" transform="translate(.027972 .944)" fill="#fff">
+ <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="#fff"/>
+ </g>
+ <g opacity=".7" transform="translate(0 -.056)" fill="url(#c)">
+ <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="url(#b)"/>
+ </g>
</svg>
diff --git a/core/img/actions/share.svg b/core/img/actions/share.svg
index a5f2f8cb4d2a4e745ac14e8b706764538ec3c34e..d67d35c6e5668b77afb88c2d49c3b69d9bedb7d2 100644
--- a/core/img/actions/share.svg
+++ b/core/img/actions/share.svg
@@ -1,70 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="share.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="7.919596"
- inkscape:cx="-4.1004833"
- inkscape:cy="12.085717"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid2985"
- empspacing="8"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- dotted="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;overflow:visible"
- d="m 12.227825,1037.3622 c -1.356528,0 -2.45919,1.0977 -2.45919,2.4542 0,0.075 0.0084,0.1504 0.0149,0.2236 l -4.734564,2.4145 c -0.429101,-0.3667 -0.986112,-0.5863 -1.594748,-0.5863 -1.356527,0 -2.454223,1.0977 -2.454223,2.4543 0,1.3565 1.097696,2.4542 2.454223,2.4542 0.546067,0 1.052763,-0.1755 1.46061,-0.477 l 4.863734,2.4741 c -0.0024,0.044 -0.0099,0.089 -0.0099,0.1342 0,1.3565 1.102663,2.4542 2.45919,2.4542 1.356527,0 2.454223,-1.0977 2.454223,-2.4542 0,-1.3565 -1.097696,-2.4592 -2.454223,-2.4592 -0.636532,0 -1.218019,0.2437 -1.654365,0.6409 L 5.878678,1044.7 c 0.01892,-0.1228 0.03478,-0.2494 0.03478,-0.3775 0,-0.072 -0.0089,-0.1437 -0.0149,-0.2137 l 4.73953,-2.4145 c 0.428025,0.3627 0.984876,0.5813 1.58978,0.5813 1.356527,0 2.454223,-1.1027 2.454223,-2.4592 0,-1.3565 -1.097696,-2.4542 -2.454223,-2.4542 z"
- id="circle54"
- inkscape:connector-curvature="0" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
+ </g>
</svg>
diff --git a/core/img/actions/shared.svg b/core/img/actions/shared.svg
index 2302cc98919cbf01035c654ca0716fcfeab03b87..3e63cc54687186e3a83ae7bca6121190d41bb40e 100644
--- a/core/img/actions/shared.svg
+++ b/core/img/actions/shared.svg
@@ -1,1738 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="users.svg"
- inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/personal.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="5.8712803"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3417"
- xlink:href="#linearGradient3587-6-5-10"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="20.074369"
- x2="14.152531"
- y1="-1.4095211"
- x1="14.501121"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3437"
- xlink:href="#linearGradient3587-6-5-19"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4127"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- inkscape:connector-curvature="0"
- id="path2880-5-3-9-2"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 4.5688738,2.4830511 c -0.9648083,0 -1.7832921,0.7055933 -1.7832921,1.6161756 0.00685,0.2878093 0.032588,0.6427159 0.2043359,1.3932536 l 0,0.018581 0.018574,0.018573 c 0.055135,0.1579316 0.1353681,0.2482737 0.2414872,0.3715352 0.1061191,0.1232607 0.2326347,0.2683371 0.3529435,0.3901106 0.014154,0.014326 0.023227,0.023201 0.037149,0.037163 0.023859,0.10383 0.052763,0.2155718 0.074304,0.3158043 0.057317,0.2666774 0.051439,0.4555265 0.037155,0.5201477 C 3.3369413,7.3099685 2.8211499,7.4833329 2.3583332,7.6845423 2.098497,7.797507 1.8633735,7.8983808 1.6710221,8.0189236 1.4786714,8.1394673 1.2873756,8.2305391 1.2251996,8.501919 c -7.972e-4,0.012367 -7.972e-4,0.024787 0,0.037163 -0.060756,0.5578815 -0.1526614,1.3782525 -0.2229116,1.931979 -0.0151658,0.116557 0.046264,0.239427 0.1486075,0.297228 0.8403342,0.453932 2.131186,0.636628 3.4179767,0.631608 1.2867901,-0.005 2.5673618,-0.198451 3.3808242,-0.631608 0.1023419,-0.0578 0.1637753,-0.180671 0.1486076,-0.297228 C 8.0758756,10.297976 8.0483234,9.9076775 8.0240004,9.5236465 7.9996757,9.1396165 7.9785611,8.761852 7.9496986,8.5390808 7.9396279,8.4838569 7.9135213,8.4316576 7.8753932,8.3904667 7.6169852,8.0818878 7.2309122,7.8932484 6.7794115,7.7031288 6.3672181,7.5295608 5.8839866,7.3493151 5.4047914,7.1458272 c -0.02682,-0.059748 -0.053461,-0.233582 0,-0.5015715 0.014356,-0.071959 0.036836,-0.1490327 0.055729,-0.2229212 0.045032,-0.05044 0.080132,-0.091658 0.1300317,-0.1486132 C 5.6969774,6.1512485 5.8113313,6.023821 5.9063431,5.9011869 6.0013555,5.7785519 6.0790889,5.6733465 6.1292547,5.5296516 l 0.018574,-0.018581 C 6.3419943,4.7274034 6.3420955,4.4003931 6.352165,4.1178159 l 0,-0.018573 c 0,-0.9105811 -0.818482,-1.6161744 -1.7832922,-1.6161744 z M 9.6699343,0.99999453 c -1.4066511,0 -2.5999668,1.02868367 -2.5999668,2.35622057 0.00998,0.4195963 0.047512,0.9370148 0.2979133,2.0312236 l 0,0.027083 0.027081,0.027083 c 0.080384,0.230248 0.1973613,0.3619578 0.3520786,0.54166 0.1547174,0.1797023 0.3391718,0.3912086 0.514577,0.5687425 0.020637,0.020887 0.033864,0.033826 0.054161,0.054175 0.034785,0.1513735 0.076926,0.3142816 0.1083314,0.4604109 0.083566,0.3887889 0.074995,0.6641113 0.054171,0.758323 C 7.8738277,8.0371487 7.121825,8.2898971 6.4470573,8.58324 6.0682268,8.7479308 5.7254263,8.8949953 5.4449859,9.0707345 c -0.2804394,0.17574 -0.5593407,0.308514 -0.6499909,0.704158 -0.00116,0.01804 -0.00116,0.03613 0,0.05418 -0.08858,0.8133375 -0.2225741,2.0093535 -0.324996,2.8166315 -0.022111,0.169929 0.067452,0.349061 0.2166637,0.433328 1.2251728,0.661787 3.1071818,0.92814 4.9832698,0.920822 1.8760865,-0.0073 3.7431075,-0.289321 4.9291025,-0.920822 0.14921,-0.08427 0.238778,-0.263399 0.216664,-0.433328 -0.0327,-0.252341 -0.07287,-0.821355 -0.108332,-1.381233 -0.03546,-0.559878 -0.06625,-1.11062 -0.108329,-1.4353995 -0.01468,-0.0805 -0.05274,-0.156611 -0.108333,-0.216664 C 14.113957,9.1625255 13.551078,8.887509 12.892809,8.6103329 12.291848,8.3572881 11.587316,8.094509 10.888669,7.7978433 c -0.0391,-0.087106 -0.07795,-0.3405381 0,-0.7312406 0.02093,-0.1049108 0.05371,-0.2172748 0.08125,-0.3249962 0.06566,-0.073537 0.116829,-0.1336294 0.189581,-0.2166638 0.155164,-0.1770945 0.321887,-0.3628712 0.46041,-0.5416592 0.138524,-0.1787888 0.251856,-0.3321687 0.324996,-0.5416609 l 0.02708,-0.027083 c 0.283087,-1.1425075 0.283235,-1.6192551 0.297916,-2.0312247 l 0,-0.027083 c 0,-1.3275361 -1.193313,-2.3562198 -2.5999669,-2.3562198 z" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.5689 2.4831c-0.96481 0-1.7833 0.70559-1.7833 1.6162 0.00685 0.28781 0.032588 0.64272 0.20434 1.3933v0.018581l0.018574 0.018573c0.055135 0.15793 0.13537 0.24827 0.24149 0.37154 0.10612 0.12326 0.23263 0.26834 0.35294 0.39011 0.014154 0.014326 0.023227 0.023201 0.037149 0.037163 0.023859 0.10383 0.052763 0.21557 0.074304 0.3158 0.057317 0.26668 0.051439 0.45553 0.037155 0.52015-0.4146 0.1454-0.9304 0.3187-1.3932 0.5199-0.2598 0.113-0.4949 0.2139-0.6873 0.3344-0.1923 0.1206-0.3836 0.2116-0.4458 0.483-0.0007972 0.012367-0.0007972 0.024787 0 0.037163-0.060756 0.55788-0.15266 1.3783-0.22291 1.932-0.015166 0.11656 0.046264 0.23943 0.14861 0.29723 0.84033 0.45393 2.1312 0.63663 3.418 0.63161 1.2868-0.005 2.5674-0.19845 3.3808-0.63161 0.10234-0.0578 0.16378-0.18067 0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.059748-0.053461-0.23358 0-0.50157 0.014356-0.071959 0.036836-0.14903 0.055729-0.22292 0.045032-0.05044 0.080132-0.091658 0.13003-0.14861 0.1064-0.1215 0.2207-0.2489 0.3157-0.3715 0.0951-0.1226 0.1728-0.2279 0.223-0.3715l0.018574-0.018581c0.1941-0.7837 0.1942-1.1107 0.2043-1.3933v-0.018573c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067 0-2.6 1.0287-2.6 2.3562 0.00998 0.4196 0.047512 0.93701 0.29791 2.0312v0.027083l0.027081 0.027083c0.080384 0.23025 0.19736 0.36196 0.35208 0.54166s0.33917 0.39121 0.51458 0.56874c0.020637 0.020887 0.033864 0.033826 0.054161 0.054175 0.034785 0.15137 0.076926 0.31428 0.10833 0.46041 0.083566 0.38879 0.074995 0.66411 0.054171 0.75832-0.6045 0.2122-1.3565 0.465-2.0312 0.7583-0.3789 0.1647-0.7217 0.3118-1.0021 0.4875-0.28044 0.17574-0.55934 0.30851-0.64999 0.70416-0.00116 0.01804-0.00116 0.03613 0 0.05418-0.08858 0.81334-0.22257 2.0094-0.325 2.8166-0.022111 0.16993 0.067452 0.34906 0.21666 0.43333 1.2252 0.66179 3.1072 0.92814 4.9833 0.92082 1.8761-0.0073 3.7431-0.28932 4.9291-0.92082 0.14921-0.08427 0.23878-0.2634 0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.087106-0.07795-0.34054 0-0.73124 0.02093-0.10491 0.05371-0.21727 0.08125-0.325 0.06566-0.073537 0.11683-0.13363 0.18958-0.21666 0.15516-0.17709 0.32189-0.36287 0.46041-0.54166s0.25186-0.33217 0.325-0.54166l0.02708-0.027083c0.28309-1.1425 0.28324-1.6193 0.29792-2.0312v-0.027083c0-1.3275-1.1933-2.3562-2.6-2.3562z"/>
</svg>
diff --git a/core/img/actions/sound-off.svg b/core/img/actions/sound-off.svg
index 053291311faa708c2ba53dc8885d4e15ef9b7238..701d7a1a64ed788dacf184a0c4d3c9cb945dc7f3 100644
--- a/core/img/actions/sound-off.svg
+++ b/core/img/actions/sound-off.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="sound.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/sound.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="3.1681698"
- inkscape:cx="17.017228"
- inkscape:cy="33.367762"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 1,1042.3622 0,4 3,0 3,3 1,0 0,-10 -1,0 -3,3 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m1 1042.4v4h3l3 3h1v-10h-1l-3 3z"/>
+ </g>
</svg>
diff --git a/core/img/actions/sound.svg b/core/img/actions/sound.svg
index 6feea076a4448d68ef91feef5152168091fc8d28..ecadf7dae902cb2f313e8cddf46d716c58010677 100644
--- a/core/img/actions/sound.svg
+++ b/core/img/actions/sound.svg
@@ -1,78 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="sound-off.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/pause.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="3.1681698"
- inkscape:cx="17.017228"
- inkscape:cy="33.367762"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 1,1042.3622 0,4 3,0 3,3 1,0 0,-10 -1,0 -3,3 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 13.25,1039.3622 -0.78125,0.625 c 0.965189,1.1998 1.53125,2.7153 1.53125,4.375 0,1.6597 -0.566061,3.1752 -1.53125,4.375 l 0.78125,0.625 c 1.098257,-1.3697 1.75,-3.1078 1.75,-5 0,-1.8922 -0.651743,-3.6303 -1.75,-5 z m -1.5625,1.25 -0.8125,0.6563 c 0.687912,0.8565 1.125,1.9096 1.125,3.0937 0,1.1841 -0.437088,2.2372 -1.125,3.0938 l 0.8125,0.6562 c 0.823121,-1.0271 1.3125,-2.3314 1.3125,-3.75 0,-1.4186 -0.489379,-2.7229 -1.3125,-3.75 z m -1.5625,1.25 -0.78125,0.625 c 0.411273,0.5135 0.65625,1.1659 0.65625,1.875 0,0.7091 -0.244977,1.3615 -0.65625,1.875 l 0.78125,0.625 c 0.545316,-0.6836 0.875,-1.5576 0.875,-2.5 0,-0.9424 -0.329684,-1.8164 -0.875,-2.5 z"
- id="path3105"
- inkscape:connector-curvature="0" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m1 1042.4v4h3l3 3h1v-10h-1l-3 3z"/>
+ <path d="m13.25 1039.4-0.78125 0.625c0.96519 1.1998 1.5312 2.7153 1.5312 4.375s-0.56606 3.1752-1.5312 4.375l0.78125 0.625c1.0983-1.3697 1.75-3.1078 1.75-5s-0.65174-3.6303-1.75-5zm-1.5625 1.25-0.8125 0.6563c0.68791 0.8565 1.125 1.9096 1.125 3.0937s-0.43709 2.2372-1.125 3.0938l0.8125 0.6562c0.82312-1.0271 1.3125-2.3314 1.3125-3.75s-0.48938-2.7229-1.3125-3.75zm-1.5625 1.25-0.78125 0.625c0.41127 0.5135 0.65625 1.1659 0.65625 1.875s-0.24498 1.3615-0.65625 1.875l0.78125 0.625c0.54532-0.6836 0.875-1.5576 0.875-2.5s-0.32968-1.8164-0.875-2.5z"/>
+ </g>
</svg>
diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png
index 6ef3f2227b7a3bc0dc5eccf87a4158564cfdd065..d06e5cb32b5a7c5d3ae69bf421ef0e21f7cfd318 100644
Binary files a/core/img/actions/toggle.png and b/core/img/actions/toggle.png differ
diff --git a/core/img/actions/toggle.svg b/core/img/actions/toggle.svg
index 82a5171477ee0d4c864f50567cc82b28edf88787..1b774a19b110e106d59651325dc8d6a3d1a90344 100644
--- a/core/img/actions/toggle.svg
+++ b/core/img/actions/toggle.svg
@@ -1,61 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- x="0px"
- y="0px"
- width="16px"
- height="9px"
- viewBox="0 0 16 9"
- overflow="visible"
- enable-background="new 0 0 16 9"
- xml:space="preserve"
- id="svg2"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="eye_all.svg"><metadata
- id="metadata12"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1021"
- id="namedview10"
- showgrid="false"
- inkscape:zoom="20.75"
- inkscape:cx="8.0963855"
- inkscape:cy="4.5"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" />
-<defs
- id="defs4">
-</defs>
-<path
- fill="#575756"
- d="M7.999,0C4.89,0,2.073,1.719,0,4.5C2.073,7.281,4.89,9,7.999,9C11.11,9,13.927,7.281,16,4.5 C13.927,1.719,11.108,0,7.999,0z M8,7.5c-1.657,0-3-1.343-3-3s1.343-3,3-3c1.657,0,3,1.343,3,3S9.657,7.5,8,7.5z"
- id="path6"
- style="fill:#222222;fill-opacity:1" />
-<circle
- fill="#575756"
- cx="8"
- cy="4.501"
- r="1.5"
- id="circle8"
- style="fill:#222222;fill-opacity:1" />
-</svg>
\ No newline at end of file
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 16 9" xml:space="preserve" overflow="visible" height="9px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 16 9">
+<path d="m7.999 0c-3.109 0-5.926 1.719-7.999 4.5 2.073 2.781 4.89 4.5 7.999 4.5 3.111 0 5.928-1.719 8.001-4.5-2.073-2.781-4.892-4.5-8.001-4.5zm0.001 7.5c-1.657 0-3-1.343-3-3s1.343-3 3-3c1.657 0 3 1.343 3 3s-1.343 3-3 3z" fill="#222"/>
+<circle cy="4.501" cx="8" r="1.5" fill="#222"/>
+</svg>
diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
index 14825f701146398259292881410727962c776ad8..0ffcf6cbc449edeeceb8951f71c8e37d19ab2270 100644
Binary files a/core/img/actions/triangle-n.png and b/core/img/actions/triangle-n.png differ
diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg
index e8d70fa8ce3387c7e8f7146f247c599f1c03bd2f..4f866978f48df88384209054c7658afeadedc74f 100644
--- a/core/img/actions/triangle-n.svg
+++ b/core/img/actions/triangle-n.svg
@@ -1,88 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16px"
- height="16px"
- id="svg6077"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="triangle-n.svg"
- inkscape:export-filename="triangle-n.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs6079">
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-0.54681372,-0.39376081,0,14.87048,24.63452)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="22.197802"
- inkscape:cx="-6.9113863"
- inkscape:cy="8"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:document-units="px"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata6082">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 12,12 8,3.9999999 3.9999999,11.989 z"
- id="path3716"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m12 12-4-8-4 7.989z"/>
</svg>
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index f36faef2b8ad8c706943eafbed40748ca791e5a0..0f533b142eba0be5834b67ac57ad78f3de822661 100644
Binary files a/core/img/actions/triangle-s.png and b/core/img/actions/triangle-s.png differ
diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
index 396c61e01e22bdf981f039d22840b496673eee2d..b178b20a20bdd4b1f821539e5f8ec94b3c82f02a 100644
--- a/core/img/actions/triangle-s.svg
+++ b/core/img/actions/triangle-s.svg
@@ -1,88 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16px"
- height="16px"
- id="svg6077"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="triangle-s.svg"
- inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/triangle-s.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs6079">
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.54681372,-0.39376081,0,14.87048,-9.6346)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="22.197802"
- inkscape:cx="1.0398514"
- inkscape:cy="8"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:document-units="px"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata6082">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 4,3.9999999 8,12 12,4.0109999 z"
- id="path3716"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4 4 4 8 4-7.989z"/>
</svg>
diff --git a/core/img/actions/upload-white.svg b/core/img/actions/upload-white.svg
index 32ecd8b82b7a320a7bed94351ce5f4e710d85c9e..9c54cac5e1e67630c599d9d98eeb6ced71e57d9f 100644
--- a/core/img/actions/upload-white.svg
+++ b/core/img/actions/upload-white.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="upload.svg"
- inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="774"
- inkscape:window-x="0"
- inkscape:window-y="26"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- d="m 10,1051.3622 -4,0 -1,-7 -4,0 7,-7 7,7 -4,0 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/actions/upload.svg b/core/img/actions/upload.svg
index 718da8f4a59a0a48181bec67681660af6ff8765c..eae4515c7223bb00ef1642f15ebb4b25019d3b74 100644
--- a/core/img/actions/upload.svg
+++ b/core/img/actions/upload.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="upload-white.svg"
- inkscape:export-filename="/home/user/owncloud/core/img/actions/upload-white.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="17.921875"
- inkscape:cx="-5.3403178"
- inkscape:cy="10.148736"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="774"
- inkscape:window-x="0"
- inkscape:window-y="26"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1036.3622)">
- <path
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m 10,1051.3622 -4,0 -1,-7 -4,0 7,-7 7,7 -4,0 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+ <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z"/>
+ </g>
</svg>
diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg
index 6d0dc714ce402be6245fc81a7e6ef829d545956d..aa7195737085be476f9f8b49eaa088c003643fd8 100644
--- a/core/img/actions/user.svg
+++ b/core/img/actions/user.svg
@@ -1,1698 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="user.svg"
- inkscape:export-filename="user.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="16"
- inkscape:cx="6.2464037"
- inkscape:cy="5.7411894"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="47.208389"
- x2="-39.421574"
- y1="-5.2547116"
- x1="-39.421574"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3397"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- id="path2880-5-3"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:1"
- d="m 8.4036095,0.99999982 c -1.7311503,0 -3.199751,1.26607188 -3.199751,2.89996308 0.012287,0.516426 0.058473,1.1532486 0.3666387,2.4999667 l 0,0.033333 0.033328,0.033333 c 0.098928,0.2833818 0.2428905,0.4454861 0.4332995,0.6666581 0.190409,0.2211719 0.4174151,0.4814874 0.6332844,0.6999905 0.025397,0.025708 0.041676,0.041633 0.066656,0.066677 0.04281,0.1863059 0.094672,0.386808 0.1333222,0.5666595 0.1028444,0.4785093 0.092296,0.817368 0.066668,0.93332 -0.7438941,0.26121 -1.6693756,0.572285 -2.4998049,0.9333223 -0.4662227,0.202697 -0.8881034,0.383698 -1.2332384,0.599993 -0.3451339,0.216295 -0.6883746,0.379709 -0.7999369,0.866656 -0.1600387,0.632932 -0.19866,0.753904 -0.399969,1.533302 -0.027212,0.209143 0.083011,0.429614 0.2666456,0.533326 1.507807,0.814508 3.8239751,1.142327 6.1328564,1.13332 2.3088796,-0.009 4.6066016,-0.356087 6.0661936,-1.13332 0.117388,-0.07353 0.143041,-0.108689 0.133323,-0.233305 -0.04365,-0.68908 -0.08154,-1.366916 -0.133319,-1.766644 -0.01807,-0.09908 -0.06492,-0.192753 -0.133324,-0.266663 -0.46366,-0.553698 -1.156389,-0.89218 -1.966513,-1.23332 -0.739597,-0.31144 -1.606657,-0.6348603 -2.4664743,-0.9999873 -0.048123,-0.107207 -0.095926,-0.4191236 0,-0.8999881 0.025759,-0.1291209 0.066096,-0.2674152 0.099994,-0.3999952 0.0808,-0.090507 0.143781,-0.164467 0.233316,-0.2666632 0.190958,-0.2179623 0.396144,-0.4466106 0.56662,-0.6666572 0.170482,-0.2200478 0.309958,-0.4088229 0.399971,-0.6666594 l 0.03333,-0.033333 c 0.34839,-1.4061623 0.348571,-1.9929284 0.366639,-2.4999678 l 0,-0.033333 c 0,-1.6338901 -1.468599,-2.899962 -3.199751,-2.899962 z"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccsscscssccccccccscscsscccssc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/>
</svg>
diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png
index 80339d78229a0047c048fb1560cdd11f86aebbec..330ae09ea73057a29f05e2288787a31300cbb7aa 100644
Binary files a/core/img/actions/view-close.png and b/core/img/actions/view-close.png differ
diff --git a/core/img/actions/view-close.svg b/core/img/actions/view-close.svg
index 45d66976084e8859b414ca9ea418610f23805dc9..1d5b1a9f49fe2bb76700f6e08f8cfe7f3b7d12a6 100644
--- a/core/img/actions/view-close.svg
+++ b/core/img/actions/view-close.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="view-close.svg"
- inkscape:export-filename="view-close.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="6.3363397"
- inkscape:cx="4.7098147"
- inkscape:cy="23.356371"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1020.3622)">
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- d="m 6,1028.3622 2,-2 8,7 8,-7 2,2 -7,8 7,8 -2,2 -8,-7 -8,7 -2,-2 7,-8 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+ <path d="m6 1028.4 2-2 8 7 8-7 2 2-7 8 7 8-2 2-8-7-8 7-2-2 7-8z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/actions/view-next.png b/core/img/actions/view-next.png
index b76bea06713c6bd66eb4913a70f8ce88b55d5829..f9e6174ae3fca018910d4d640242f3a1451b2e65 100644
Binary files a/core/img/actions/view-next.png and b/core/img/actions/view-next.png differ
diff --git a/core/img/actions/view-next.svg b/core/img/actions/view-next.svg
index d5642f1a11cb50d4bd0c81bad1d1a732e4c45a0a..07c95b73ff0e40bfd7bdbc398c5508275ae6e6ee 100644
--- a/core/img/actions/view-next.svg
+++ b/core/img/actions/view-next.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="view-next.svg"
- inkscape:export-filename="view-next.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="6.3363398"
- inkscape:cx="30.082863"
- inkscape:cy="19.387471"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1020.3622)">
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- d="m 9,1024.3622 2,-2 14,14 -14,14 -2,-2 10,-12 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+ <path d="m9 1024.4 2-2 14 14-14 14-2-2 10-12z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/actions/view-pause.png b/core/img/actions/view-pause.png
index 64264ff9281a2114a7c662b93c96018ba5da9777..94696bf686876842a9113d016daf15f4468a7425 100644
Binary files a/core/img/actions/view-pause.png and b/core/img/actions/view-pause.png differ
diff --git a/core/img/actions/view-pause.svg b/core/img/actions/view-pause.svg
index 0edc6f14e28059dce9fed6cea3c1235ab77bcffc..d901a4d789ec2a119b3853e34b55b0f0325666cb 100644
--- a/core/img/actions/view-pause.svg
+++ b/core/img/actions/view-pause.svg
@@ -1,72 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="pause.svg"
- inkscape:export-filename="view-pause.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="6.3363397"
- inkscape:cx="8.9383019"
- inkscape:cy="10.400115"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1020.3622)">
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- d="m 6,1026.3622 0,20 8,0 0,-20 -8,0 z m 12,0 0,20 8,0 0,-20 -8,0 z"
- id="path3086"
- inkscape:connector-curvature="0" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+ <path fill="#fff" d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z"/>
+ </g>
</svg>
diff --git a/core/img/actions/view-play.png b/core/img/actions/view-play.png
index 0080d45b5cdc57d396bba4ade8c42b36ea197edd..721787d9c44eb9e84b055eecdffd260d47b87c86 100644
Binary files a/core/img/actions/view-play.png and b/core/img/actions/view-play.png differ
diff --git a/core/img/actions/view-play.svg b/core/img/actions/view-play.svg
index 0bdc63bf7e1d07e21af60d0e8982c35059750be0..d9fa355371c6daa38ce75a10f0d7624bff1beb40 100644
--- a/core/img/actions/view-play.svg
+++ b/core/img/actions/view-play.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="play.svg"
- inkscape:export-filename="view-play.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="6.3363397"
- inkscape:cx="12.629914"
- inkscape:cy="9.5218526"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1020.3622)">
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- d="m 4,1024.3622 24,12 -24,12 z"
- id="path3086"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+ <path d="m4 1024.4 24 12-24 12z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/actions/view-previous.png b/core/img/actions/view-previous.png
index 82943c23a59ca65b54c2882c4a2ea8901fb42998..97b41a195ff97cc7122b27f9b0245e7c3d3dca43 100644
Binary files a/core/img/actions/view-previous.png and b/core/img/actions/view-previous.png differ
diff --git a/core/img/actions/view-previous.svg b/core/img/actions/view-previous.svg
index df1f49511d070184f4f5d98311b8e2d60190d5d8..68a31c044336a74e748db3b6d998131bad805e98 100644
--- a/core/img/actions/view-previous.svg
+++ b/core/img/actions/view-previous.svg
@@ -1,73 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3875"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="view-next.svg"
- inkscape:export-filename="view-previous.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3877" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.67268"
- inkscape:cx="13.313675"
- inkscape:cy="18.927817"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3883"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3880">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1020.3622)">
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path2984"
- d="m 23,1024.3622 -2,-2 -14,14 14,14 2,-2 -10,-12 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+ <path d="m23 1024.4-2-2-14 14 14 14 2-2-10-12z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/appstore.png b/core/img/appstore.png
index 009b2b51b98ae5ccaa835aa56a350142dfb2e827..234aa0bb6be0ebf1f215d49a674cfc25a111ff3f 100644
Binary files a/core/img/appstore.png and b/core/img/appstore.png differ
diff --git a/core/img/breadcrumb-start.svg b/core/img/breadcrumb-start.svg
index 4197763dc6ca678f1cb2d032e51427925fb81212..7f36231cdf8d370d8abc8ea1cb2ea50b21f0c657 100644
--- a/core/img/breadcrumb-start.svg
+++ b/core/img/breadcrumb-start.svg
@@ -1,71 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="11"
- height="36"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="New document 1">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="18.657977"
- inkscape:cx="2.6788772"
- inkscape:cy="16.807262"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3760"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1016.3622)">
- <path
- transform="translate(0,1016.3622)"
- style="fill:#dddddd;fill-opacity:1;stroke:none"
- d="M 0,0 11,18 0,36 z"
- id="rect3757"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="36" width="11" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1016.4)">
+ <path d="m0 0 11 18-11 18z" transform="translate(0 1016.4)" fill="#ddd"/>
+ </g>
</svg>
diff --git a/core/img/breadcrumb.svg b/core/img/breadcrumb.svg
index 9d522b42b73ac7918b39f7c2df3c585573097cc9..05a216e50a9eaec7a20be7274957dc6e8ae2f46f 100644
--- a/core/img/breadcrumb.svg
+++ b/core/img/breadcrumb.svg
@@ -1,77 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="11"
- height="36"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="breadcrumb.svg"
- inkscape:export-filename="/home/jancborchardt/breadcrumb.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="26.386364"
- inkscape:cx="1.7139473"
- inkscape:cy="25.655289"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid3760"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1016.3622)">
- <path
- transform="translate(0,1016.3622)"
- style="fill:#dddddd;fill-opacity:1;stroke:#dddddd;stroke-width:0.89999998000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:31.20000076000000178;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
- d="m 0.5,0 10,18 -10,18 10,-18 z"
- id="rect3757"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc"
- inkscape:export-filename="/home/jancborchardt/breadcrumb-start.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="36" width="11" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1016.4)">
+ <path d="m0.5 0 10 18-10 18 10-18z" transform="translate(0 1016.4)" stroke="#ddd" stroke-linecap="round" stroke-miterlimit="31.2" stroke-width="0.9" fill="#ddd"/>
+ </g>
</svg>
diff --git a/core/img/desktopapp.png b/core/img/desktopapp.png
index 182ddd2cf18891878210352e9ac0f34d7d89409d..25dae6f197a2f22308ced296cc8bbdd8dc4f9750 100644
Binary files a/core/img/desktopapp.png and b/core/img/desktopapp.png differ
diff --git a/core/img/desktopapp.svg b/core/img/desktopapp.svg
index 93d91e461a613db6c49ce5d498e0e9971492ac98..a983e6f9598c212dec5d377656efb7a2ce847efd 100644
--- a/core/img/desktopapp.svg
+++ b/core/img/desktopapp.svg
@@ -1,100 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="170"
- height="60"
- viewBox="0 0 1346.4 475.2"
- enable-background="new 0 0 792 612"
- xml:space="preserve"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="desktopapp.svg"
- inkscape:export-filename="desktopapp.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"><metadata
- id="metadata3043"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs3041" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- id="namedview3039"
- showgrid="true"
- fit-margin-top="3"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="3"
- inkscape:zoom="2"
- inkscape:cx="155.97228"
- inkscape:cy="56.168028"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1"
- showguides="true"
- inkscape:guide-bbox="true"><inkscape:grid
- type="xygrid"
- id="grid3146"
- empspacing="4"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- originx="-3.5865408e-16px"
- originy="-3px" /></sodipodi:namedview>
-
-
-<rect
- id="rect3026"
- width="1346.3999"
- height="475.20016"
- x="-2.8405402e-15"
- y="-3.5527137e-15"
- rx="50"
- ry="50"
- style="fill:#1a1a1a" /><path
- d="m 150.48,126.72 c -11.88,0 -23.76,11.88 -23.76,23.76 l 0,166.32 -47.52,23.76 0,11.88 c 0,0 0,11.88 11.88,11.88 l 356.4,0 c 11.88,0 11.88,-11.88 11.88,-11.88 l 0,-11.88 -47.52,-23.76 0,-166.32 c 0,-11.88 -11.88,-23.76 -23.76,-23.76 z m 0,23.66718 237.6,0 0,142.65282 -237.6,0 z"
- id="path3037"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sscccsscccsssccccc"
- style="fill:#ffffff" /><text
- xml:space="preserve"
- style="font-size:316.79998778999998876px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
- x="451.44"
- y="239.58"
- id="text2983"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan2985"
- x="451.44"
- y="239.58"
- style="font-size:126.71999999999999886px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:FreeSans Semi-Bold;fill:#ffffff">Desktop app</tspan></text>
-<text
- xml:space="preserve"
- style="font-size:316.79998778999998876px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
- x="493.01996"
- y="342.54001"
- id="text2991"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan2993"
- x="493.01996"
- y="342.54001"
- style="font-size:71.28000000000000114px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:FreeSans;fill:#ffffff">Windows, OS X, Linux</tspan></text>
-</svg>
\ No newline at end of file
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 792 612" xml:space="preserve" height="60" viewBox="0 0 1346.4 475.2" width="170" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<rect rx="50" ry="50" height="475.2" width="1346.4" y="-3.5527e-15" x="-2.8405e-15" fill="#1a1a1a"/><path fill="#fff" d="m150.48 126.72c-11.88 0-23.76 11.88-23.76 23.76v166.32l-47.52 23.76v11.88s0 11.88 11.88 11.88h356.4c11.88 0 11.88-11.88 11.88-11.88v-11.88l-47.52-23.76v-166.32c0-11.88-11.88-23.76-23.76-23.76zm0 23.667h237.6v142.65h-237.6z"/><text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="239.58" x="451.44" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-weight="600" font-size="126.72px" y="239.58" x="451.44" font-family="FreeSans" fill="#ffffff">Desktop app</tspan></text>
+<text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="342.54001" x="493.01996" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="71.28px" y="342.54001" x="493.01996" font-family="FreeSans" fill="#ffffff">Windows, OS X, Linux</tspan></text>
+</svg>
diff --git a/core/img/favicon-touch.svg b/core/img/favicon-touch.svg
index 6d766d3ced328b30f7a53c9dedeaa4f67030f8b1..68f36a8a9ac7822c978782049f6a06e34bbeddd4 100644
--- a/core/img/favicon-touch.svg
+++ b/core/img/favicon-touch.svg
@@ -1,787 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="128"
- height="128"
- viewBox="0 0 128 127.99999"
- enable-background="new 0 0 595.275 311.111"
- xml:space="preserve"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="favicon.svg"
- inkscape:export-filename="/home/user/owncloud/core/img/favicon.png"
- inkscape:export-xdpi="89.826416"
- inkscape:export-ydpi="89.826416"><metadata
- id="metadata327"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs325"><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_1_"
- id="linearGradient3353"
- gradientUnits="userSpaceOnUse"
- x1="288.49411"
- y1="55.888199"
- x2="288.49411"
- y2="339.22189" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_2_"
- id="linearGradient3355"
- gradientUnits="userSpaceOnUse"
- x1="251.2114"
- y1="55.888199"
- x2="251.2114"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_3_"
- id="linearGradient3357"
- gradientUnits="userSpaceOnUse"
- x1="293.22461"
- y1="55.888199"
- x2="293.22461"
- y2="339.22171" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_4_"
- id="linearGradient3359"
- gradientUnits="userSpaceOnUse"
- x1="375.33401"
- y1="55.888199"
- x2="375.33401"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_5_"
- id="linearGradient3361"
- gradientUnits="userSpaceOnUse"
- x1="334.49411"
- y1="55.888199"
- x2="334.49411"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_6_"
- id="linearGradient3363"
- gradientUnits="userSpaceOnUse"
- x1="458.42679"
- y1="55.8867"
- x2="458.42679"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_7_"
- id="linearGradient3365"
- gradientUnits="userSpaceOnUse"
- x1="413.16309"
- y1="55.888199"
- x2="413.16309"
- y2="339.22131" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_8_"
- id="linearGradient3367"
- gradientUnits="userSpaceOnUse"
- x1="290.76169"
- y1="55.8867"
- x2="290.76169"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_9_"
- id="linearGradient3369"
- gradientUnits="userSpaceOnUse"
- x1="346.77341"
- y1="55.888199"
- x2="346.77341"
- y2="339.22119" />
- <linearGradient
- y2="339.22189"
- x2="288.49411"
- y1="55.888199"
- x1="288.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_1_">
- <stop
- id="stop261"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop263"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="251.2114"
- y1="55.888199"
- x1="251.2114"
- gradientUnits="userSpaceOnUse"
- id="SVGID_2_">
- <stop
- id="stop268"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop270"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22171"
- x2="293.22461"
- y1="55.888199"
- x1="293.22461"
- gradientUnits="userSpaceOnUse"
- id="SVGID_3_">
- <stop
- id="stop275"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop277"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="375.33401"
- y1="55.888199"
- x1="375.33401"
- gradientUnits="userSpaceOnUse"
- id="SVGID_4_">
- <stop
- id="stop282"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop284"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="334.49411"
- y1="55.888199"
- x1="334.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_5_">
- <stop
- id="stop289"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop291"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="458.42679"
- y1="55.8867"
- x1="458.42679"
- gradientUnits="userSpaceOnUse"
- id="SVGID_6_">
- <stop
- id="stop296"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop298"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22131"
- x2="413.16309"
- y1="55.888199"
- x1="413.16309"
- gradientUnits="userSpaceOnUse"
- id="SVGID_7_">
- <stop
- id="stop303"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop305"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="290.76169"
- y1="55.8867"
- x1="290.76169"
- gradientUnits="userSpaceOnUse"
- id="SVGID_8_">
- <stop
- id="stop310"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop312"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22119"
- x2="346.77341"
- y1="55.888199"
- x1="346.77341"
- gradientUnits="userSpaceOnUse"
- id="SVGID_9_">
- <stop
- id="stop317"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop319"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
-<linearGradient
- y2="18.967093"
- x2="-2.4040222"
- y1="4.4573336"
- x1="-2.4040222"
- gradientTransform="translate(13.927091,16.573387)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3475"
- xlink:href="#linearGradient3587-6-5-26"
- inkscape:collect="always" /><linearGradient
- id="linearGradient3587-6-5-26"><stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" /><stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" /></linearGradient></defs><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="774"
- id="namedview323"
- showgrid="false"
- inkscape:zoom="2"
- inkscape:cx="121.64549"
- inkscape:cy="57.492689"
- inkscape:window-x="0"
- inkscape:window-y="26"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1"
- units="px"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- showguides="true"
- inkscape:guide-bbox="true" />
-<pattern
- y="565.223"
- width="69"
- height="69"
- patternUnits="userSpaceOnUse"
- id="Polka_Dot_Pattern"
- viewBox="2.125 -70.896 69 69"
- overflow="visible">
- <g
- id="g4">
- <polygon
- fill="none"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon6" />
- <polygon
- fill="#F6BB60"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon8" />
- <g
- id="g10">
- <path
- fill="#FFFFFF"
- d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path12" />
- <path
- fill="#FFFFFF"
- d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path14" />
- <path
- fill="#FFFFFF"
- d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path16" />
- <path
- fill="#FFFFFF"
- d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path18" />
- <path
- fill="#FFFFFF"
- d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path20" />
- <path
- fill="#FFFFFF"
- d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path22" />
- <path
- fill="#FFFFFF"
- d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path24" />
- <path
- fill="#FFFFFF"
- d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path26" />
- <path
- fill="#FFFFFF"
- d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path28" />
- </g>
- <g
- id="g30">
- <path
- fill="#FFFFFF"
- d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path32" />
- </g>
- <path
- fill="#FFFFFF"
- d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path34" />
- <g
- id="g36">
- <g
- id="g38">
- <path
- fill="#FFFFFF"
- d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path40" />
- <path
- fill="#FFFFFF"
- d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path42" />
- <path
- fill="#FFFFFF"
- d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path44" />
- <path
- fill="#FFFFFF"
- d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path46" />
- <path
- fill="#FFFFFF"
- d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path48" />
- <path
- fill="#FFFFFF"
- d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path50" />
- <path
- fill="#FFFFFF"
- d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path52" />
- <path
- fill="#FFFFFF"
- d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path54" />
- <path
- fill="#FFFFFF"
- d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path56" />
- <path
- fill="#FFFFFF"
- d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path58" />
- </g>
- <g
- id="g60">
- <path
- fill="#FFFFFF"
- d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path62" />
- <path
- fill="#FFFFFF"
- d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path64" />
- <path
- fill="#FFFFFF"
- d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path66" />
- <path
- fill="#FFFFFF"
- d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path68" />
- <path
- fill="#FFFFFF"
- d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path70" />
- <path
- fill="#FFFFFF"
- d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path72" />
- <path
- fill="#FFFFFF"
- d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path74" />
- <path
- fill="#FFFFFF"
- d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path76" />
- <path
- fill="#FFFFFF"
- d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path78" />
- <path
- fill="#FFFFFF"
- d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path80" />
- </g>
- <g
- id="g82">
- <path
- fill="#FFFFFF"
- d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path84" />
- <path
- fill="#FFFFFF"
- d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path86" />
- <path
- fill="#FFFFFF"
- d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path88" />
- <path
- fill="#FFFFFF"
- d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path90" />
- <path
- fill="#FFFFFF"
- d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path92" />
- <path
- fill="#FFFFFF"
- d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path94" />
- <path
- fill="#FFFFFF"
- d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path96" />
- <path
- fill="#FFFFFF"
- d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path98" />
- <path
- fill="#FFFFFF"
- d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path100" />
- <path
- fill="#FFFFFF"
- d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path102" />
- </g>
- <g
- id="g104">
- <path
- fill="#FFFFFF"
- d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path106" />
- <path
- fill="#FFFFFF"
- d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path108" />
- <path
- fill="#FFFFFF"
- d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path110" />
- <path
- fill="#FFFFFF"
- d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path112" />
- <path
- fill="#FFFFFF"
- d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path114" />
- <path
- fill="#FFFFFF"
- d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path116" />
- <path
- fill="#FFFFFF"
- d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path118" />
- <path
- fill="#FFFFFF"
- d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path120" />
- <path
- fill="#FFFFFF"
- d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C8.15-41.004,8.149-41.02,8.14-41.04"
- id="path122" />
- <path
- fill="#FFFFFF"
- d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path124" />
- </g>
- <g
- id="g126">
- <path
- fill="#FFFFFF"
- d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path128" />
- <path
- fill="#FFFFFF"
- d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path130" />
- <path
- fill="#FFFFFF"
- d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path132" />
- <path
- fill="#FFFFFF"
- d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path134" />
- <path
- fill="#FFFFFF"
- d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path136" />
- <path
- fill="#FFFFFF"
- d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path138" />
- <path
- fill="#FFFFFF"
- d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path140" />
- <path
- fill="#FFFFFF"
- d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path142" />
- <path
- fill="#FFFFFF"
- d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path144" />
- <path
- fill="#FFFFFF"
- d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path146" />
- </g>
- <g
- id="g148">
- <path
- fill="#FFFFFF"
- d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path150" />
- <path
- fill="#FFFFFF"
- d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path152" />
- <path
- fill="#FFFFFF"
- d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path154" />
- <path
- fill="#FFFFFF"
- d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path156" />
- <path
- fill="#FFFFFF"
- d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path158" />
- <path
- fill="#FFFFFF"
- d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path160" />
- <path
- fill="#FFFFFF"
- d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path162" />
- <path
- fill="#FFFFFF"
- d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path164" />
- <path
- fill="#FFFFFF"
- d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path166" />
- <path
- fill="#FFFFFF"
- d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path168" />
- </g>
- <g
- id="g170">
- <path
- fill="#FFFFFF"
- d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path172" />
- <path
- fill="#FFFFFF"
- d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path174" />
- <path
- fill="#FFFFFF"
- d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path176" />
- <path
- fill="#FFFFFF"
- d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path178" />
- <path
- fill="#FFFFFF"
- d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path180" />
- <path
- fill="#FFFFFF"
- d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path182" />
- <path
- fill="#FFFFFF"
- d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path184" />
- <path
- fill="#FFFFFF"
- d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path186" />
- <path
- fill="#FFFFFF"
- d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path188" />
- <path
- fill="#FFFFFF"
- d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path190" />
- </g>
- <g
- id="g192">
- <path
- fill="#FFFFFF"
- d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path194" />
- <path
- fill="#FFFFFF"
- d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path196" />
- <path
- fill="#FFFFFF"
- d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path198" />
- <path
- fill="#FFFFFF"
- d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path200" />
- <path
- fill="#FFFFFF"
- d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path202" />
- <path
- fill="#FFFFFF"
- d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path204" />
- <path
- fill="#FFFFFF"
- d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path206" />
- <path
- fill="#FFFFFF"
- d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path208" />
- <path
- fill="#FFFFFF"
- d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path210" />
- <path
- fill="#FFFFFF"
- d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631 C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path212" />
- </g>
- </g>
- <g
- id="g214">
- <path
- fill="#FFFFFF"
- d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46 c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path216" />
- <path
- fill="#FFFFFF"
- d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path218" />
- <path
- fill="#FFFFFF"
- d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path220" />
- <path
- fill="#FFFFFF"
- d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path222" />
- <path
- fill="#FFFFFF"
- d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path224" />
- <path
- fill="#FFFFFF"
- d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path226" />
- <path
- fill="#FFFFFF"
- d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path228" />
- <path
- fill="#FFFFFF"
- d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C15.81-2.74,15.809-2.756,15.8-2.776"
- id="path230" />
- <path
- fill="#FFFFFF"
- d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751 C8.15-2.74,8.149-2.756,8.14-2.776"
- id="path232" />
- <path
- fill="#FFFFFF"
- d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46 C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631 C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751 C0.489-2.74,0.488-2.756,0.479-2.776"
- id="path234" />
- </g>
- </g>
-</pattern>
-
-<rect
- style="fill:#1d2d44;fill-opacity:1"
- id="rect7667"
- width="128"
- height="128"
- x="0"
- y="-1.5000001e-06"
- rx="20"
- ry="20" /><path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 58.33248,29.12399 c -8.931744,0 -16.147768,7.21604 -16.147768,16.14776 0,3.68172 1.225952,7.07024 3.292884,9.78364 4.483908,-5.1898 11.101748,-8.48548 18.490768,-8.48548 3.615048,0 7.043084,0.805 10.13194,2.21636 0.25008,-1.131 0.37996,-2.30724 0.37996,-3.51452 0,-8.93172 -7.216012,-16.14776 -16.147764,-16.14776 z M 37.2454,36.59631 c -4.651408,0 -8.390508,3.77076 -8.390508,8.42216 0,1.506 0.38852,2.92896 1.076512,4.14776 2.80684,-1.58336 6.051864,-2.50132 9.498688,-2.50132 0.33264,0 0.653036,0.012 0.981536,0.032 -0.0372,-0.47152 -0.06328,-0.9438 -0.06328,-1.4248 0,-2.59072 0.562688,-5.05568 1.551452,-7.28232 -1.33128,-0.89272 -2.926288,-1.39312 -4.654356,-1.39312 z m 39.83116,5.7942 c -0.34364,0 -0.674872,0.042 -1.013196,0.0632 0.14636,0.92272 0.25328,1.85444 0.25328,2.81796 0,1.49944 -0.19068,2.94632 -0.538256,4.33772 4.074936,2.25512 7.45902,5.62936 9.68866,9.72032 2.312644,-1.204 4.892476,-1.96952 7.630616,-2.15304 -0.705676,-8.27576 -7.561776,-14.78628 -16.02112,-14.78628 z m -13.108196,6.01584 c -12.498188,0 -22.606872,10.1078 -22.606872,22.60684 0,12.49768 10.108168,22.60688 22.606872,22.60688 12.498716,0 22.60688,-10.1092 22.60688,-22.60688 0,-12.499 -10.10868,-22.60684 -22.60688,-22.60684 z m -24.538272,0.0948 c -9.696224,0 -17.5409,7.84468 -17.5409,17.54092 0,5.70796 2.719624,10.761 6.93404,13.96304 1.776716,-3.42676 5.34516,-5.76252 9.46702,-5.76252 0.498168,0 0.976332,0.0604 1.456464,0.1268 -0.15072,-1.09656 -0.22164,-2.21844 -0.22164,-3.3562 0,-5.43972 1.770672,-10.47008 4.780996,-14.53296 -1.801952,-2.25484 -3.0915,-4.96408 -3.641168,-7.9156 -0.407372,-0.028 -0.820216,-0.0632 -1.234824,-0.0632 z m 54.965732,10.44856 c -2.94422,0 -5.702192,0.75168 -8.137212,2.0264 1.382684,3.06272 2.153036,6.46088 2.153036,10.03692 0,6.69584 -2.692088,12.77572 -7.060688,17.1926 3.209324,3.56304 7.865672,5.7942 13.044864,5.7942 9.696226,0 17.540916,-7.84464 17.540916,-17.54088 0,-9.69624 -7.84469,-17.50924 -17.540916,-17.50924 z m -74.2164,2.31152 C 11.24742,61.26123 4,68.44531 4,77.37731 c 0,8.932 7.24742,16.17944 16.179424,16.17944 3.399648,0 6.5489,-1.0592 9.150408,-2.8496 -1.074996,-1.67044 -1.709768,-3.66752 -1.709768,-5.7942 0,-1.10384 0.16288,-2.16428 0.474928,-3.16624 -4.870276,-3.51968 -8.04222,-9.24728 -8.04222,-15.70448 0,-1.64064 0.2162,-3.22704 0.601592,-4.74936 -0.15996,-0.004 -0.3138,-0.032 -0.47494,-0.032 z m 94.955196,13.86808 c -0.47649,0 -0.93756,0.0544 -1.39314,0.1268 0.0252,0.40276 0.0316,0.79408 0.0316,1.20316 0,5.15012 -2.03206,9.82456 -5.31926,13.29816 1.61719,1.8806 3.99262,3.07124 6.68075,3.07124 4.89645,0 8.86544,-3.93732 8.86544,-8.8338 0,-4.89644 -3.96899,-8.8654 -8.86544,-8.8654 z m -76.844368,0.94984 c -4.8962,0 -8.833776,3.9376 -8.833776,8.8338 0,4.89616 3.937576,8.86544 8.833776,8.86544 3.753,0 6.93856,-2.34184 8.2322,-5.63592 -3.156528,-3.21488 -5.42508,-7.31624 -6.427444,-11.87332 -0.586568,-0.1212 -1.181936,-0.19 -1.804756,-0.19 z"
- id="circle238"
- inkscape:export-filename="/home/user/owncloud/core/img/logo.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sscscsscscscscccscscccsssssssscscsccsscscssscsscscsccccscssccsssccs" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
+<svg xml:space="preserve" height="128" viewBox="0 0 128 127.99999" xmlns:dc="http://purl.org/dc/elements/1.1/" width="128" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111">
+<rect rx="20" ry="20" height="128" width="128" y="-0.0000015" x="0" fill="#1d2d44"/><path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m58.332 29.124c-8.9317 0-16.148 7.216-16.148 16.148 0 3.6817 1.226 7.0702 3.2929 9.7836 4.4839-5.1898 11.102-8.4855 18.491-8.4855 3.615 0 7.0431 0.805 10.132 2.2164 0.25008-1.131 0.37996-2.3072 0.37996-3.5145 0-8.9317-7.216-16.148-16.148-16.148zm-21.087 7.472c-4.6514 0-8.3905 3.7708-8.3905 8.4222 0 1.506 0.38852 2.929 1.0765 4.1478 2.8068-1.5834 6.0519-2.5013 9.4987-2.5013 0.33264 0 0.65304 0.012 0.98154 0.032-0.0372-0.47152-0.06328-0.9438-0.06328-1.4248 0-2.5907 0.56269-5.0557 1.5515-7.2823-1.3313-0.89272-2.9263-1.3931-4.6544-1.3931zm39.831 5.7942c-0.34364 0-0.67487 0.042-1.0132 0.0632 0.14636 0.92272 0.25328 1.8544 0.25328 2.818 0 1.4994-0.19068 2.9463-0.53826 4.3377 4.0749 2.2551 7.459 5.6294 9.6887 9.7203 2.3126-1.204 4.8925-1.9695 7.6306-2.153-0.70568-8.2758-7.5618-14.786-16.021-14.786zm-13.108 6.0158c-12.498 0-22.607 10.108-22.607 22.607 0 12.498 10.108 22.607 22.607 22.607s22.607-10.109 22.607-22.607c0-12.499-10.109-22.607-22.607-22.607zm-24.538 0.0948c-9.6962 0-17.541 7.8447-17.541 17.541 0 5.708 2.7196 10.761 6.934 13.963 1.7767-3.4268 5.3452-5.7625 9.467-5.7625 0.49817 0 0.97633 0.0604 1.4565 0.1268-0.15072-1.0966-0.22164-2.2184-0.22164-3.3562 0-5.4397 1.7707-10.47 4.781-14.533-1.802-2.2548-3.0915-4.9641-3.6412-7.9156-0.40737-0.028-0.82022-0.0632-1.2348-0.0632zm54.966 10.449c-2.9442 0-5.7022 0.75168-8.1372 2.0264 1.3827 3.0627 2.153 6.4609 2.153 10.037 0 6.6958-2.6921 12.776-7.0607 17.193 3.2093 3.563 7.8657 5.7942 13.045 5.7942 9.6962 0 17.541-7.8446 17.541-17.541 0-9.6962-7.8447-17.509-17.541-17.509zm-74.216 2.3115c-8.933-0.001-16.18 7.183-16.18 16.115s7.2474 16.179 16.179 16.179c3.3996 0 6.5489-1.0592 9.1504-2.8496-1.075-1.6704-1.7098-3.6675-1.7098-5.7942 0-1.1038 0.16288-2.1643 0.47493-3.1662-4.8703-3.5197-8.0422-9.2473-8.0422-15.704 0-1.6406 0.2162-3.227 0.60159-4.7494-0.15996-0.004-0.3138-0.032-0.47494-0.032zm94.955 13.868c-0.47649 0-0.93756 0.0544-1.3931 0.1268 0.0252 0.40276 0.0316 0.79408 0.0316 1.2032 0 5.1501-2.0321 9.8246-5.3193 13.298 1.6172 1.8806 3.9926 3.0712 6.6808 3.0712 4.8964 0 8.8654-3.9373 8.8654-8.8338 0-4.8964-3.969-8.8654-8.8654-8.8654zm-76.844 0.94984c-4.8962 0-8.8338 3.9376-8.8338 8.8338s3.9376 8.8654 8.8338 8.8654c3.753 0 6.9386-2.3418 8.2322-5.6359-3.1565-3.2149-5.4251-7.3162-6.4274-11.873-0.58657-0.1212-1.1819-0.19-1.8048-0.19z" fill="#fff"/>
+</svg>
diff --git a/core/img/favicon.png b/core/img/favicon.png
index 79b6795f6f6c3b0c9c6b703460f294a3832d0e4e..02936243cb13d8e7bfa816f2b577f748a4615e36 100644
Binary files a/core/img/favicon.png and b/core/img/favicon.png differ
diff --git a/core/img/favicon.svg b/core/img/favicon.svg
index f055c32efb6066c93e32f3bc7cbb3a189a616be4..39cb17426895187ecc5cadcea140591168110807 100644
--- a/core/img/favicon.svg
+++ b/core/img/favicon.svg
@@ -1,796 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="32"
- height="32"
- viewBox="0 0 32 31.999997"
- enable-background="new 0 0 595.275 311.111"
- xml:space="preserve"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="logo-iconbluesmall.svg"
- inkscape:export-filename="/home/user/owncloud/core/img/favicon.png"
- inkscape:export-xdpi="89.826416"
- inkscape:export-ydpi="89.826416"><metadata
- id="metadata327"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs325"><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_1_"
- id="linearGradient3353"
- gradientUnits="userSpaceOnUse"
- x1="288.49411"
- y1="55.888199"
- x2="288.49411"
- y2="339.22189" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_2_"
- id="linearGradient3355"
- gradientUnits="userSpaceOnUse"
- x1="251.2114"
- y1="55.888199"
- x2="251.2114"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_3_"
- id="linearGradient3357"
- gradientUnits="userSpaceOnUse"
- x1="293.22461"
- y1="55.888199"
- x2="293.22461"
- y2="339.22171" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_4_"
- id="linearGradient3359"
- gradientUnits="userSpaceOnUse"
- x1="375.33401"
- y1="55.888199"
- x2="375.33401"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_5_"
- id="linearGradient3361"
- gradientUnits="userSpaceOnUse"
- x1="334.49411"
- y1="55.888199"
- x2="334.49411"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_6_"
- id="linearGradient3363"
- gradientUnits="userSpaceOnUse"
- x1="458.42679"
- y1="55.8867"
- x2="458.42679"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_7_"
- id="linearGradient3365"
- gradientUnits="userSpaceOnUse"
- x1="413.16309"
- y1="55.888199"
- x2="413.16309"
- y2="339.22131" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_8_"
- id="linearGradient3367"
- gradientUnits="userSpaceOnUse"
- x1="290.76169"
- y1="55.8867"
- x2="290.76169"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_9_"
- id="linearGradient3369"
- gradientUnits="userSpaceOnUse"
- x1="346.77341"
- y1="55.888199"
- x2="346.77341"
- y2="339.22119" />
- <linearGradient
- y2="339.22189"
- x2="288.49411"
- y1="55.888199"
- x1="288.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_1_">
- <stop
- id="stop261"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop263"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="251.2114"
- y1="55.888199"
- x1="251.2114"
- gradientUnits="userSpaceOnUse"
- id="SVGID_2_">
- <stop
- id="stop268"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop270"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22171"
- x2="293.22461"
- y1="55.888199"
- x1="293.22461"
- gradientUnits="userSpaceOnUse"
- id="SVGID_3_">
- <stop
- id="stop275"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop277"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="375.33401"
- y1="55.888199"
- x1="375.33401"
- gradientUnits="userSpaceOnUse"
- id="SVGID_4_">
- <stop
- id="stop282"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop284"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="334.49411"
- y1="55.888199"
- x1="334.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_5_">
- <stop
- id="stop289"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop291"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="458.42679"
- y1="55.8867"
- x1="458.42679"
- gradientUnits="userSpaceOnUse"
- id="SVGID_6_">
- <stop
- id="stop296"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop298"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22131"
- x2="413.16309"
- y1="55.888199"
- x1="413.16309"
- gradientUnits="userSpaceOnUse"
- id="SVGID_7_">
- <stop
- id="stop303"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop305"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="290.76169"
- y1="55.8867"
- x1="290.76169"
- gradientUnits="userSpaceOnUse"
- id="SVGID_8_">
- <stop
- id="stop310"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop312"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22119"
- x2="346.77341"
- y1="55.888199"
- x1="346.77341"
- gradientUnits="userSpaceOnUse"
- id="SVGID_9_">
- <stop
- id="stop317"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop319"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
-<linearGradient
- y2="18.967093"
- x2="-2.4040222"
- y1="4.4573336"
- x1="-2.4040222"
- gradientTransform="translate(13.927091,16.573387)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3475"
- xlink:href="#linearGradient3587-6-5-26"
- inkscape:collect="always" /><linearGradient
- id="linearGradient3587-6-5-26"><stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" /><stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" /></linearGradient><filter
- inkscape:collect="always"
- id="filter4274"
- x="-0.075768784"
- width="1.1515376"
- y="-0.14014855"
- height="1.2802971"><feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.94710989"
- id="feGaussianBlur4276" /></filter></defs><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="774"
- id="namedview323"
- showgrid="false"
- inkscape:zoom="8"
- inkscape:cx="-8.6923201"
- inkscape:cy="19.488907"
- inkscape:window-x="0"
- inkscape:window-y="26"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1"
- units="px"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- showguides="true"
- inkscape:guide-bbox="true" />
-<pattern
- y="565.223"
- width="69"
- height="69"
- patternUnits="userSpaceOnUse"
- id="Polka_Dot_Pattern"
- viewBox="2.125 -70.896 69 69"
- overflow="visible">
- <g
- id="g4">
- <polygon
- fill="none"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon6" />
- <polygon
- fill="#F6BB60"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon8" />
- <g
- id="g10">
- <path
- fill="#FFFFFF"
- d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path12" />
- <path
- fill="#FFFFFF"
- d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path14" />
- <path
- fill="#FFFFFF"
- d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path16" />
- <path
- fill="#FFFFFF"
- d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path18" />
- <path
- fill="#FFFFFF"
- d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path20" />
- <path
- fill="#FFFFFF"
- d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path22" />
- <path
- fill="#FFFFFF"
- d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path24" />
- <path
- fill="#FFFFFF"
- d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path26" />
- <path
- fill="#FFFFFF"
- d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path28" />
- </g>
- <g
- id="g30">
- <path
- fill="#FFFFFF"
- d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path32" />
- </g>
- <path
- fill="#FFFFFF"
- d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path34" />
- <g
- id="g36">
- <g
- id="g38">
- <path
- fill="#FFFFFF"
- d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path40" />
- <path
- fill="#FFFFFF"
- d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path42" />
- <path
- fill="#FFFFFF"
- d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path44" />
- <path
- fill="#FFFFFF"
- d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path46" />
- <path
- fill="#FFFFFF"
- d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path48" />
- <path
- fill="#FFFFFF"
- d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path50" />
- <path
- fill="#FFFFFF"
- d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path52" />
- <path
- fill="#FFFFFF"
- d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path54" />
- <path
- fill="#FFFFFF"
- d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path56" />
- <path
- fill="#FFFFFF"
- d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path58" />
- </g>
- <g
- id="g60">
- <path
- fill="#FFFFFF"
- d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path62" />
- <path
- fill="#FFFFFF"
- d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path64" />
- <path
- fill="#FFFFFF"
- d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path66" />
- <path
- fill="#FFFFFF"
- d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path68" />
- <path
- fill="#FFFFFF"
- d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path70" />
- <path
- fill="#FFFFFF"
- d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path72" />
- <path
- fill="#FFFFFF"
- d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path74" />
- <path
- fill="#FFFFFF"
- d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path76" />
- <path
- fill="#FFFFFF"
- d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path78" />
- <path
- fill="#FFFFFF"
- d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path80" />
- </g>
- <g
- id="g82">
- <path
- fill="#FFFFFF"
- d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path84" />
- <path
- fill="#FFFFFF"
- d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path86" />
- <path
- fill="#FFFFFF"
- d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path88" />
- <path
- fill="#FFFFFF"
- d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path90" />
- <path
- fill="#FFFFFF"
- d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path92" />
- <path
- fill="#FFFFFF"
- d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path94" />
- <path
- fill="#FFFFFF"
- d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path96" />
- <path
- fill="#FFFFFF"
- d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path98" />
- <path
- fill="#FFFFFF"
- d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path100" />
- <path
- fill="#FFFFFF"
- d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path102" />
- </g>
- <g
- id="g104">
- <path
- fill="#FFFFFF"
- d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path106" />
- <path
- fill="#FFFFFF"
- d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path108" />
- <path
- fill="#FFFFFF"
- d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path110" />
- <path
- fill="#FFFFFF"
- d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path112" />
- <path
- fill="#FFFFFF"
- d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path114" />
- <path
- fill="#FFFFFF"
- d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path116" />
- <path
- fill="#FFFFFF"
- d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path118" />
- <path
- fill="#FFFFFF"
- d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path120" />
- <path
- fill="#FFFFFF"
- d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C8.15-41.004,8.149-41.02,8.14-41.04"
- id="path122" />
- <path
- fill="#FFFFFF"
- d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path124" />
- </g>
- <g
- id="g126">
- <path
- fill="#FFFFFF"
- d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path128" />
- <path
- fill="#FFFFFF"
- d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path130" />
- <path
- fill="#FFFFFF"
- d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path132" />
- <path
- fill="#FFFFFF"
- d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path134" />
- <path
- fill="#FFFFFF"
- d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path136" />
- <path
- fill="#FFFFFF"
- d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path138" />
- <path
- fill="#FFFFFF"
- d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path140" />
- <path
- fill="#FFFFFF"
- d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path142" />
- <path
- fill="#FFFFFF"
- d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path144" />
- <path
- fill="#FFFFFF"
- d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path146" />
- </g>
- <g
- id="g148">
- <path
- fill="#FFFFFF"
- d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path150" />
- <path
- fill="#FFFFFF"
- d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path152" />
- <path
- fill="#FFFFFF"
- d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path154" />
- <path
- fill="#FFFFFF"
- d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path156" />
- <path
- fill="#FFFFFF"
- d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path158" />
- <path
- fill="#FFFFFF"
- d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path160" />
- <path
- fill="#FFFFFF"
- d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path162" />
- <path
- fill="#FFFFFF"
- d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path164" />
- <path
- fill="#FFFFFF"
- d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path166" />
- <path
- fill="#FFFFFF"
- d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path168" />
- </g>
- <g
- id="g170">
- <path
- fill="#FFFFFF"
- d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path172" />
- <path
- fill="#FFFFFF"
- d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path174" />
- <path
- fill="#FFFFFF"
- d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path176" />
- <path
- fill="#FFFFFF"
- d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path178" />
- <path
- fill="#FFFFFF"
- d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path180" />
- <path
- fill="#FFFFFF"
- d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path182" />
- <path
- fill="#FFFFFF"
- d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path184" />
- <path
- fill="#FFFFFF"
- d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path186" />
- <path
- fill="#FFFFFF"
- d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path188" />
- <path
- fill="#FFFFFF"
- d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path190" />
- </g>
- <g
- id="g192">
- <path
- fill="#FFFFFF"
- d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path194" />
- <path
- fill="#FFFFFF"
- d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path196" />
- <path
- fill="#FFFFFF"
- d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path198" />
- <path
- fill="#FFFFFF"
- d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path200" />
- <path
- fill="#FFFFFF"
- d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path202" />
- <path
- fill="#FFFFFF"
- d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path204" />
- <path
- fill="#FFFFFF"
- d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path206" />
- <path
- fill="#FFFFFF"
- d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path208" />
- <path
- fill="#FFFFFF"
- d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path210" />
- <path
- fill="#FFFFFF"
- d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631 C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path212" />
- </g>
- </g>
- <g
- id="g214">
- <path
- fill="#FFFFFF"
- d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46 c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path216" />
- <path
- fill="#FFFFFF"
- d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path218" />
- <path
- fill="#FFFFFF"
- d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path220" />
- <path
- fill="#FFFFFF"
- d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path222" />
- <path
- fill="#FFFFFF"
- d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path224" />
- <path
- fill="#FFFFFF"
- d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path226" />
- <path
- fill="#FFFFFF"
- d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path228" />
- <path
- fill="#FFFFFF"
- d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C15.81-2.74,15.809-2.756,15.8-2.776"
- id="path230" />
- <path
- fill="#FFFFFF"
- d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751 C8.15-2.74,8.149-2.756,8.14-2.776"
- id="path232" />
- <path
- fill="#FFFFFF"
- d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46 C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631 C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751 C0.489-2.74,0.488-2.756,0.479-2.776"
- id="path234" />
- </g>
- </g>
-</pattern>
-
-<rect
- style="fill:#1d2d44;fill-opacity:1"
- id="rect7667"
- width="32"
- height="32"
- x="0"
- y="-5.2587893e-06"
- rx="5"
- ry="5" /><path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 14.58312,7.280992 c -2.232936,0 -4.036942,1.80401 -4.036942,4.03694 0,0.92043 0.306488,1.76756 0.823221,2.44591 1.120977,-1.29745 2.775437,-2.12137 4.622692,-2.12137 0.903762,0 1.760771,0.20125 2.532985,0.55409 0.06252,-0.28275 0.09499,-0.57681 0.09499,-0.87863 0,-2.23293 -1.804003,-4.03694 -4.036941,-4.03694 z m -5.27177,1.86808 c -1.162852,0 -2.097627,0.94269 -2.097627,2.10554 0,0.3765 0.09713,0.73224 0.269128,1.03694 0.70171,-0.39584 1.512966,-0.62533 2.374672,-0.62533 0.08316,0 0.163259,0.003 0.245384,0.008 -0.0093,-0.11788 -0.01582,-0.23595 -0.01582,-0.3562 0,-0.64768 0.140672,-1.26392 0.387863,-1.82058 -0.33282,-0.22318 -0.731572,-0.34828 -1.163589,-0.34828 z m 9.95779,1.44855 c -0.08591,0 -0.168718,0.0105 -0.253299,0.0158 0.03659,0.23068 0.06332,0.46361 0.06332,0.70449 0,0.37486 -0.04767,0.73658 -0.134564,1.08443 1.018734,0.56378 1.864755,1.40734 2.422165,2.43008 0.578161,-0.301 1.223119,-0.49238 1.907654,-0.53826 -0.176419,-2.06894 -1.890444,-3.69657 -4.00528,-3.69657 z m -3.277049,1.50396 c -3.124547,0 -5.651718,2.52695 -5.651718,5.65171 0,3.12442 2.527042,5.65172 5.651718,5.65172 3.124679,0 5.65172,-2.5273 5.65172,-5.65172 0,-3.12475 -2.52717,-5.65171 -5.65172,-5.65171 z m -6.134568,0.0237 c -2.424056,0 -4.385225,1.96117 -4.385225,4.38523 0,1.42699 0.679906,2.69025 1.73351,3.49076 0.444179,-0.85669 1.33629,-1.44063 2.366755,-1.44063 0.124542,0 0.244083,0.0151 0.364116,0.0317 -0.03768,-0.27414 -0.05541,-0.55461 -0.05541,-0.83905 0,-1.35993 0.442668,-2.61752 1.195249,-3.63324 -0.450488,-0.56371 -0.772875,-1.24102 -0.910292,-1.9789 -0.101843,-0.007 -0.205054,-0.0158 -0.308706,-0.0158 z m 13.741433,2.61214 c -0.736055,0 -1.425548,0.18792 -2.034303,0.5066 0.345671,0.76568 0.538259,1.61522 0.538259,2.50923 0,1.67396 -0.673022,3.19393 -1.765172,4.29815 0.802331,0.89076 1.966418,1.44855 3.261216,1.44855 2.424057,0 4.385229,-1.96116 4.385229,-4.38522 0,-2.42406 -1.961172,-4.37731 -4.385229,-4.37731 z m -18.5541,0.57788 C 2.811855,15.315302 1,17.111322 1,19.344322 c 0,2.233 1.811855,4.04486 4.044856,4.04486 0.849912,0 1.637225,-0.2648 2.287602,-0.7124 -0.268749,-0.41761 -0.427442,-0.91688 -0.427442,-1.44855 0,-0.27596 0.04072,-0.54107 0.118732,-0.79156 -1.217569,-0.87992 -2.010555,-2.31182 -2.010555,-3.92612 0,-0.41016 0.05405,-0.80676 0.150398,-1.18734 -0.03999,-10e-4 -0.07845,-0.008 -0.118735,-0.008 z m 23.738799,3.46702 c -0.119122,0 -0.23439,0.0136 -0.348285,0.0317 0.0063,0.10069 0.0079,0.19852 0.0079,0.30079 0,1.28753 -0.508015,2.45614 -1.329815,3.32454 0.404298,0.47015 0.998155,0.76781 1.670188,0.76781 1.224112,0 2.21636,-0.98433 2.21636,-2.20845 0,-1.22411 -0.992248,-2.21635 -2.21636,-2.21635 z m -19.211092,0.23746 c -1.22405,0 -2.208444,0.9844 -2.208444,2.20845 0,1.22404 0.984394,2.21636 2.208444,2.21636 0.93825,0 1.73464,-0.58546 2.05805,-1.40898 -0.789132,-0.80372 -1.35627,-1.82906 -1.606861,-2.96833 -0.146642,-0.0303 -0.295484,-0.0475 -0.451189,-0.0475 z"
- id="circle238"
- inkscape:export-filename="/home/user/owncloud/core/img/logo.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sscscsscscscscccscscccsssssssscscsccsscscssscsscscsccccscssccsssccs" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
+<svg xml:space="preserve" height="32" viewBox="0 0 32 31.999997" xmlns:dc="http://purl.org/dc/elements/1.1/" width="32" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111">
+<rect rx="5" ry="5" height="32" width="32" y="-.0000052588" x="0" fill="#1d2d44"/><path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m14.583 7.281c-2.2329 0-4.0369 1.804-4.0369 4.0369 0 0.92043 0.30649 1.7676 0.82322 2.4459 1.121-1.2974 2.7754-2.1214 4.6227-2.1214 0.90376 0 1.7608 0.20125 2.533 0.55409 0.06252-0.28275 0.09499-0.57681 0.09499-0.87863 0-2.2329-1.804-4.0369-4.0369-4.0369zm-5.2718 1.8681c-1.1629 0-2.0976 0.94269-2.0976 2.1055 0 0.3765 0.09713 0.73224 0.26913 1.0369 0.70171-0.39584 1.513-0.62533 2.3747-0.62533 0.08316 0 0.16326 0.003 0.24538 0.008-0.0093-0.11788-0.01582-0.23595-0.01582-0.3562 0-0.64768 0.14067-1.2639 0.38786-1.8206-0.33282-0.22318-0.73157-0.34828-1.1636-0.34828zm9.9578 1.4486c-0.08591 0-0.16872 0.0105-0.2533 0.0158 0.03659 0.23068 0.06332 0.46361 0.06332 0.70449 0 0.37486-0.04767 0.73658-0.13456 1.0844 1.0187 0.56378 1.8648 1.4073 2.4222 2.4301 0.57816-0.301 1.2231-0.49238 1.9077-0.53826-0.17642-2.0689-1.8904-3.6966-4.0053-3.6966zm-3.277 1.504c-3.1245 0-5.6517 2.527-5.6517 5.6517 0 3.1244 2.527 5.6517 5.6517 5.6517s5.6517-2.5273 5.6517-5.6517c0-3.1248-2.5272-5.6517-5.6517-5.6517zm-6.1346 0.0237c-2.4241 0-4.3852 1.9612-4.3852 4.3852 0 1.427 0.67991 2.6902 1.7335 3.4908 0.44418-0.85669 1.3363-1.4406 2.3668-1.4406 0.12454 0 0.24408 0.0151 0.36412 0.0317-0.03768-0.27414-0.05541-0.55461-0.05541-0.83905 0-1.3599 0.44267-2.6175 1.1952-3.6332-0.45049-0.56371-0.77288-1.241-0.91029-1.9789-0.10184-0.007-0.20505-0.0158-0.30871-0.0158zm13.741 2.6121c-0.73606 0-1.4255 0.18792-2.0343 0.5066 0.34567 0.76568 0.53826 1.6152 0.53826 2.5092 0 1.674-0.67302 3.1939-1.7652 4.2982 0.80233 0.89076 1.9664 1.4486 3.2612 1.4486 2.4241 0 4.3852-1.9612 4.3852-4.3852 0-2.4241-1.9612-4.3773-4.3852-4.3773zm-18.554 0.57788c-2.2321-0.001-4.044 1.795-4.044 4.028s1.8119 4.0449 4.0449 4.0449c0.84991 0 1.6372-0.2648 2.2876-0.7124-0.26875-0.41761-0.42744-0.91688-0.42744-1.4486 0-0.27596 0.04072-0.54107 0.11873-0.79156-1.2176-0.87992-2.0106-2.3118-2.0106-3.9261 0-0.41016 0.05405-0.80676 0.1504-1.1873-0.03999-0.001-0.07845-0.008-0.11874-0.008zm23.739 3.467c-0.11912 0-0.23439 0.0136-0.34828 0.0317 0.0063 0.10069 0.0079 0.19852 0.0079 0.30079 0 1.2875-0.50802 2.4561-1.3298 3.3245 0.4043 0.47015 0.99816 0.76781 1.6702 0.76781 1.2241 0 2.2164-0.98433 2.2164-2.2084s-0.99225-2.2164-2.2164-2.2164zm-19.211 0.23746c-1.224 0-2.2084 0.9844-2.2084 2.2084s0.98439 2.2164 2.2084 2.2164c0.93825 0 1.7346-0.58546 2.058-1.409-0.78913-0.80372-1.3563-1.8291-1.6069-2.9683-0.14664-0.0303-0.29548-0.0475-0.45119-0.0475z" fill="#fff"/>
+</svg>
diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
index b3f6b7e5cf91efbb0d6ccf4062620c970f327ee3..1d6db5f933a4adcdc492dd91c4c75017005f4fcf 100644
Binary files a/core/img/filetypes/application-x-debian-package.png and b/core/img/filetypes/application-x-debian-package.png differ
diff --git a/core/img/googleplay.png b/core/img/googleplay.png
index 2d9ad6296080509464d3d412c8b3e93254626c3f..1470518272e729acce679bd8b05d24c128492dc6 100644
Binary files a/core/img/googleplay.png and b/core/img/googleplay.png differ
diff --git a/core/img/image-optimization.sh b/core/img/image-optimization.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0a96bf558d1c809c2ffc653a0d8c21c8b583c770
--- /dev/null
+++ b/core/img/image-optimization.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+function recursive_optimize_images() {
+cd $1;
+optipng -o6 *.png;
+jpegoptim --strip-all *.jpg;
+for svg in `ls *.svg`;
+do
+ mv $svg $svg.opttmp;
+ scour -i $svg.opttmp -o $svg --create-groups --enable-id-stripping --enable-comment-stripping --shorten-ids --remove-metadata;
+done;
+rm *.opttmp
+for dir in `ls -d */`;
+do
+ recursive_optimize_images $dir;
+ cd ..;
+done;
+}
+
+recursive_optimize_images ../../
diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png
index b0c90984e44bb4b8244339c62c609749f7db6db5..5b7d4c6f915fee2bf95c9ce7b903baf30b6c006b 100644
Binary files a/core/img/logo-wide.png and b/core/img/logo-wide.png differ
diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg
index cf8eace5204242c4ddd230f1c268cd5f0dd327a6..29c617d6f83e18df20cfd1bef593cd8483cf0924 100644
--- a/core/img/logo-wide.svg
+++ b/core/img/logo-wide.svg
@@ -1,796 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="147.33263"
- height="32"
- viewBox="0 0 147.33262 32"
- enable-background="new 0 0 595.275 311.111"
- xml:space="preserve"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="logo-wide.svg"
- inkscape:export-filename="logo-wide.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"><metadata
- id="metadata327"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs325"><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_1_"
- id="linearGradient3353"
- gradientUnits="userSpaceOnUse"
- x1="288.49411"
- y1="55.888199"
- x2="288.49411"
- y2="339.22189" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_2_"
- id="linearGradient3355"
- gradientUnits="userSpaceOnUse"
- x1="251.2114"
- y1="55.888199"
- x2="251.2114"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_3_"
- id="linearGradient3357"
- gradientUnits="userSpaceOnUse"
- x1="293.22461"
- y1="55.888199"
- x2="293.22461"
- y2="339.22171" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_4_"
- id="linearGradient3359"
- gradientUnits="userSpaceOnUse"
- x1="375.33401"
- y1="55.888199"
- x2="375.33401"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_5_"
- id="linearGradient3361"
- gradientUnits="userSpaceOnUse"
- x1="334.49411"
- y1="55.888199"
- x2="334.49411"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_6_"
- id="linearGradient3363"
- gradientUnits="userSpaceOnUse"
- x1="458.42679"
- y1="55.8867"
- x2="458.42679"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_7_"
- id="linearGradient3365"
- gradientUnits="userSpaceOnUse"
- x1="413.16309"
- y1="55.888199"
- x2="413.16309"
- y2="339.22131" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_8_"
- id="linearGradient3367"
- gradientUnits="userSpaceOnUse"
- x1="290.76169"
- y1="55.8867"
- x2="290.76169"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_9_"
- id="linearGradient3369"
- gradientUnits="userSpaceOnUse"
- x1="346.77341"
- y1="55.888199"
- x2="346.77341"
- y2="339.22119" />
- <linearGradient
- y2="339.22189"
- x2="288.49411"
- y1="55.888199"
- x1="288.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_1_">
- <stop
- id="stop261"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop263"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="251.2114"
- y1="55.888199"
- x1="251.2114"
- gradientUnits="userSpaceOnUse"
- id="SVGID_2_">
- <stop
- id="stop268"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop270"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22171"
- x2="293.22461"
- y1="55.888199"
- x1="293.22461"
- gradientUnits="userSpaceOnUse"
- id="SVGID_3_">
- <stop
- id="stop275"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop277"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="375.33401"
- y1="55.888199"
- x1="375.33401"
- gradientUnits="userSpaceOnUse"
- id="SVGID_4_">
- <stop
- id="stop282"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop284"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="334.49411"
- y1="55.888199"
- x1="334.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_5_">
- <stop
- id="stop289"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop291"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="458.42679"
- y1="55.8867"
- x1="458.42679"
- gradientUnits="userSpaceOnUse"
- id="SVGID_6_">
- <stop
- id="stop296"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop298"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22131"
- x2="413.16309"
- y1="55.888199"
- x1="413.16309"
- gradientUnits="userSpaceOnUse"
- id="SVGID_7_">
- <stop
- id="stop303"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop305"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="290.76169"
- y1="55.8867"
- x1="290.76169"
- gradientUnits="userSpaceOnUse"
- id="SVGID_8_">
- <stop
- id="stop310"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop312"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22119"
- x2="346.77341"
- y1="55.888199"
- x1="346.77341"
- gradientUnits="userSpaceOnUse"
- id="SVGID_9_">
- <stop
- id="stop317"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop319"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
-</defs><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- id="namedview323"
- showgrid="true"
- inkscape:zoom="2.8284271"
- inkscape:cx="74.404008"
- inkscape:cy="18.870615"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1"
- showguides="true"
- inkscape:guide-bbox="true"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"><inkscape:grid
- type="xygrid"
- id="grid3149"
- empspacing="4"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-<pattern
- y="565.223"
- width="69"
- height="69"
- patternUnits="userSpaceOnUse"
- id="Polka_Dot_Pattern"
- viewBox="2.125 -70.896 69 69"
- overflow="visible">
- <g
- id="g4">
- <polygon
- fill="none"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon6" />
- <polygon
- fill="#F6BB60"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon8" />
- <g
- id="g10">
- <path
- fill="#FFFFFF"
- d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path12" />
- <path
- fill="#FFFFFF"
- d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path14" />
- <path
- fill="#FFFFFF"
- d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path16" />
- <path
- fill="#FFFFFF"
- d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path18" />
- <path
- fill="#FFFFFF"
- d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path20" />
- <path
- fill="#FFFFFF"
- d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path22" />
- <path
- fill="#FFFFFF"
- d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path24" />
- <path
- fill="#FFFFFF"
- d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path26" />
- <path
- fill="#FFFFFF"
- d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path28" />
- </g>
- <g
- id="g30">
- <path
- fill="#FFFFFF"
- d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path32" />
- </g>
- <path
- fill="#FFFFFF"
- d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path34" />
- <g
- id="g36">
- <g
- id="g38">
- <path
- fill="#FFFFFF"
- d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path40" />
- <path
- fill="#FFFFFF"
- d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path42" />
- <path
- fill="#FFFFFF"
- d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path44" />
- <path
- fill="#FFFFFF"
- d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path46" />
- <path
- fill="#FFFFFF"
- d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path48" />
- <path
- fill="#FFFFFF"
- d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path50" />
- <path
- fill="#FFFFFF"
- d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path52" />
- <path
- fill="#FFFFFF"
- d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path54" />
- <path
- fill="#FFFFFF"
- d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path56" />
- <path
- fill="#FFFFFF"
- d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path58" />
- </g>
- <g
- id="g60">
- <path
- fill="#FFFFFF"
- d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path62" />
- <path
- fill="#FFFFFF"
- d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path64" />
- <path
- fill="#FFFFFF"
- d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path66" />
- <path
- fill="#FFFFFF"
- d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path68" />
- <path
- fill="#FFFFFF"
- d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path70" />
- <path
- fill="#FFFFFF"
- d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path72" />
- <path
- fill="#FFFFFF"
- d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path74" />
- <path
- fill="#FFFFFF"
- d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path76" />
- <path
- fill="#FFFFFF"
- d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path78" />
- <path
- fill="#FFFFFF"
- d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path80" />
- </g>
- <g
- id="g82">
- <path
- fill="#FFFFFF"
- d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path84" />
- <path
- fill="#FFFFFF"
- d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path86" />
- <path
- fill="#FFFFFF"
- d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path88" />
- <path
- fill="#FFFFFF"
- d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path90" />
- <path
- fill="#FFFFFF"
- d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path92" />
- <path
- fill="#FFFFFF"
- d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path94" />
- <path
- fill="#FFFFFF"
- d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path96" />
- <path
- fill="#FFFFFF"
- d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path98" />
- <path
- fill="#FFFFFF"
- d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path100" />
- <path
- fill="#FFFFFF"
- d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path102" />
- </g>
- <g
- id="g104">
- <path
- fill="#FFFFFF"
- d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path106" />
- <path
- fill="#FFFFFF"
- d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path108" />
- <path
- fill="#FFFFFF"
- d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path110" />
- <path
- fill="#FFFFFF"
- d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path112" />
- <path
- fill="#FFFFFF"
- d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path114" />
- <path
- fill="#FFFFFF"
- d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path116" />
- <path
- fill="#FFFFFF"
- d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path118" />
- <path
- fill="#FFFFFF"
- d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path120" />
- <path
- fill="#FFFFFF"
- d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C8.15-41.004,8.149-41.02,8.14-41.04"
- id="path122" />
- <path
- fill="#FFFFFF"
- d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path124" />
- </g>
- <g
- id="g126">
- <path
- fill="#FFFFFF"
- d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path128" />
- <path
- fill="#FFFFFF"
- d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path130" />
- <path
- fill="#FFFFFF"
- d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path132" />
- <path
- fill="#FFFFFF"
- d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path134" />
- <path
- fill="#FFFFFF"
- d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path136" />
- <path
- fill="#FFFFFF"
- d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path138" />
- <path
- fill="#FFFFFF"
- d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path140" />
- <path
- fill="#FFFFFF"
- d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path142" />
- <path
- fill="#FFFFFF"
- d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path144" />
- <path
- fill="#FFFFFF"
- d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path146" />
- </g>
- <g
- id="g148">
- <path
- fill="#FFFFFF"
- d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path150" />
- <path
- fill="#FFFFFF"
- d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path152" />
- <path
- fill="#FFFFFF"
- d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path154" />
- <path
- fill="#FFFFFF"
- d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path156" />
- <path
- fill="#FFFFFF"
- d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path158" />
- <path
- fill="#FFFFFF"
- d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path160" />
- <path
- fill="#FFFFFF"
- d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path162" />
- <path
- fill="#FFFFFF"
- d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path164" />
- <path
- fill="#FFFFFF"
- d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path166" />
- <path
- fill="#FFFFFF"
- d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path168" />
- </g>
- <g
- id="g170">
- <path
- fill="#FFFFFF"
- d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path172" />
- <path
- fill="#FFFFFF"
- d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path174" />
- <path
- fill="#FFFFFF"
- d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path176" />
- <path
- fill="#FFFFFF"
- d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path178" />
- <path
- fill="#FFFFFF"
- d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path180" />
- <path
- fill="#FFFFFF"
- d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path182" />
- <path
- fill="#FFFFFF"
- d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path184" />
- <path
- fill="#FFFFFF"
- d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path186" />
- <path
- fill="#FFFFFF"
- d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path188" />
- <path
- fill="#FFFFFF"
- d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path190" />
- </g>
- <g
- id="g192">
- <path
- fill="#FFFFFF"
- d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path194" />
- <path
- fill="#FFFFFF"
- d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path196" />
- <path
- fill="#FFFFFF"
- d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path198" />
- <path
- fill="#FFFFFF"
- d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path200" />
- <path
- fill="#FFFFFF"
- d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path202" />
- <path
- fill="#FFFFFF"
- d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path204" />
- <path
- fill="#FFFFFF"
- d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path206" />
- <path
- fill="#FFFFFF"
- d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path208" />
- <path
- fill="#FFFFFF"
- d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path210" />
- <path
- fill="#FFFFFF"
- d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631 C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path212" />
- </g>
- </g>
- <g
- id="g214">
- <path
- fill="#FFFFFF"
- d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46 c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path216" />
- <path
- fill="#FFFFFF"
- d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path218" />
- <path
- fill="#FFFFFF"
- d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path220" />
- <path
- fill="#FFFFFF"
- d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path222" />
- <path
- fill="#FFFFFF"
- d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path224" />
- <path
- fill="#FFFFFF"
- d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path226" />
- <path
- fill="#FFFFFF"
- d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path228" />
- <path
- fill="#FFFFFF"
- d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C15.81-2.74,15.809-2.756,15.8-2.776"
- id="path230" />
- <path
- fill="#FFFFFF"
- d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751 C8.15-2.74,8.149-2.756,8.14-2.776"
- id="path232" />
- <path
- fill="#FFFFFF"
- d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46 C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631 C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751 C0.489-2.74,0.488-2.756,0.479-2.776"
- id="path234" />
- </g>
- </g>
-</pattern>
-
-
-
-
-
-
-
-
-
-
-
-
-<path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 104 13 L 104 28.34375 C 104 30.351679 105.7108 32 107.71875 32 L 107.71875 31 C 106.1994 31 105.00005 29.863098 105 28.34375 L 105 13 L 104 13 z M 146 13 L 146 21 L 141.46875 21 C 138.47749 21 136 23.571216 136 26.5625 C 136 29.55333 138.47761 32.027578 141.46875 32 L 143.25 32 C 144.12752 32 144.98935 31.557662 145.6875 30.90625 C 146.38564 30.254838 146.9816 29.351228 147 28.34375 L 147 13 L 146 13 z M 101.5 15 C 96.864928 15 93 18.864659 93 23.5 C 93 28.135341 96.864963 32 101.5 32 L 101.5 31 C 97.353634 31 94 27.64657 94 23.5 C 94 19.35343 97.353659 16 101.5 16 L 101.5 15 z M 55.5 21 C 54.894287 21 54.299303 21.092367 53.75 21.28125 C 53.820997 21.606183 53.900137 21.944789 53.9375 22.28125 C 54.426854 22.100793 54.944546 22 55.5 22 C 58.00269 22 60 23.997307 60 26.5 C 60 29.002698 58.00269 31 55.5 31 C 54.05604 31 52.789695 30.324452 51.96875 29.28125 C 51.770697 29.536182 51.534658 29.766418 51.3125 30 C 52.329062 31.207716 53.832794 32 55.5 32 C 58.49143 32 61 29.49143 61 26.5 C 61 23.508576 58.49143 21 55.5 21 z M 63 21 L 63 28.34375 C 63.000084 30.351759 64.992445 32 67 32 C 68.368297 32 69.905251 31.305044 70.53125 30.1875 C 71.152707 31.305044 72.631958 32 74 32 C 76.007944 32 78 30.351759 78 28.34375 L 78 21 L 77 21 L 77 28.34375 C 77.000063 29.863018 75.519353 31 74 31 C 72.480637 31 71.000069 29.997995 71 28.34375 L 71 21 L 70 21 L 70 28.34375 C 70.000063 29.863098 68.519868 31 67 31 C 65.481152 31 64.000063 29.863018 64 28.34375 L 64 21 L 63 21 z M 85.53125 21 C 82.53999 21 80 23.539966 80 26.53125 L 80 32 L 81 32 L 81 26.53125 C 81 24.028717 83.028747 22 85.53125 22 C 88.034238 22 90 24.028717 90 26.53125 L 90 32 L 91 32 L 91 26.53125 C 91 23.539966 88.522913 21 85.53125 21 z M 115.5 21 C 112.50857 21 110 23.508576 110 26.5 C 110 29.491429 112.50857 32 115.5 32 C 118.49142 32 121 29.491429 121 26.5 C 121 23.508576 118.49142 21 115.5 21 z M 123 21 L 123 26.5625 C 123 29.553329 125.47749 32 128.46875 32 C 131.46 32 134 29.553379 134 26.5625 L 134 21 L 133 21 L 133 26.5625 C 133 29.064438 130.97124 31 128.46875 31 C 125.96625 31 124 29.064488 124 26.5625 L 124 21 L 123 21 z M 115.5 22 C 118.00269 22 120 23.997307 120 26.5 C 120 29.002698 118.00269 31 115.5 31 C 112.9973 31 111 29.002698 111 26.5 C 111 23.997307 112.9973 22 115.5 22 z M 141.46875 22 L 146 22 L 146 28.34375 C 145.9872 29.043638 145.64973 29.731233 145.09375 30.25 C 144.53777 30.768767 143.81736 31 143.25 31 L 141.46875 31 C 138.96626 31 137 29.064488 137 26.5625 C 137 24.059967 138.96626 22 141.46875 22 z "
- transform="translate(-3.1713867e-6,0)"
- id="path4576" /><path
- id="path4645"
- d="m 16.398236,3.6857007 c -2.294299,0 -4.138603,1.8599193 -4.138603,4.1542214 0,0.7428272 0.191646,1.444716 0.53099,2.0458759 1.384469,-0.7809966 2.985072,-1.2337725 4.685212,-1.2337725 0.164075,0 0.322108,0.00666 0.484139,0.015617 -0.01834,-0.2325805 -0.03123,-0.4655392 -0.03123,-0.7027818 0,-1.277873 0.27755,-2.4937113 0.765251,-3.5919959 C 18.037341,3.9325357 17.250605,3.6857007 16.398236,3.6857007 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4647"
- d="m 7.9804722,15.851635 c -4.4056985,0 -7.9804773346191,3.543546 -7.9804773346191,7.949243 0,4.405698 3.5747788346191,7.980478 7.9804773346191,7.980478 1.6768711,0 3.2302328,-0.522455 4.5134208,-1.405564 -0.530236,-0.823928 -0.843338,-1.808982 -0.843338,-2.857979 0,-0.54446 0.08034,-1.067529 0.234261,-1.561738 -2.4022573,-1.736077 -3.9668133,-4.561215 -3.9668133,-7.746217 0,-0.809239 0.1066379,-1.591735 0.2967301,-2.342606 -0.078902,-0.0023 -0.1547894,-0.01562 -0.2342606,-0.01562 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4649"
- d="m 17.475835,9.5578332 c -4.782649,0 -8.6520246,3.8693738 -8.6520246,8.6520248 0,2.815446 1.3414496,5.307847 3.4202046,6.887262 0.876362,-1.690252 2.636493,-2.842362 4.669595,-2.842362 0.24572,0 0.481575,0.02978 0.718399,0.06247 -0.07434,-0.540881 -0.109322,-1.094255 -0.109322,-1.655441 0,-2.683145 0.873389,-5.164355 2.358224,-7.168375 C 18.9921,12.381225 18.35603,11.044884 18.084913,9.5890679 17.883976,9.5751497 17.68034,9.5578332 17.475835,9.5578332 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4651"
- d="m 36.044892,6.5436801 c -0.169497,0 -0.332877,0.02081 -0.499756,0.031235 0.07218,0.4551333 0.124939,0.9147028 0.124939,1.3899463 0,0.7396048 -0.09406,1.4532833 -0.265495,2.1395799 2.009958,1.11234 3.679148,2.776673 4.778916,4.794534 1.140713,-0.593858 2.413207,-0.971466 3.763787,-1.061982 -0.34807,-4.0820006 -3.729828,-7.2933129 -7.902391,-7.2933129 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4653"
- d="m 26.799407,5.1362321e-7 c -4.405568,0 -7.96486,3.55928898637679 -7.96486,7.96486058637679 0,1.8159896 0.604694,3.4873779 1.624207,4.8257679 2.21168,-2.559867 5.47592,-4.1854556 9.120546,-4.1854556 1.783114,0 3.473988,0.3970656 4.997559,1.0932161 C 34.700214,9.1405309 34.764268,8.5603418 34.764268,7.9648611 34.764268,3.5592895 31.204981,5.1362321e-7 26.799407,5.1362321e-7 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4657"
- d="m 44.587596,14.711566 c -1.452231,0 -2.812602,0.370759 -4.013665,0.999512 0.682002,1.510683 1.061981,3.186835 1.061981,4.950708 0,3.302705 -1.327872,6.301597 -3.482674,8.480233 1.582992,1.757452 3.879725,2.85798 6.434358,2.85798 4.782649,0 8.652024,-3.869376 8.652024,-8.652025 0,-4.782652 -3.869375,-8.636408 -8.652024,-8.636408 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4659"
- d="m 16.91361,23.160565 c -2.415041,0 -4.357247,1.942205 -4.357247,4.357248 0,2.41504 1.942206,4.372864 4.357247,4.372864 1.851161,0 3.422433,-1.155096 4.060517,-2.779892 -1.55695,-1.585736 -2.675908,-3.608729 -3.170327,-5.856515 -0.289324,-0.05983 -0.582985,-0.09371 -0.89019,-0.09371 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /><path
- id="path4661"
- d="m 29.5793,9.510981 c -6.164715,0 -11.150805,4.985676 -11.150805,11.150805 0,6.164464 4.985835,11.150804 11.150805,11.150804 6.164969,0 11.150804,-4.98635 11.150804,-11.150804 0,-6.165118 -4.98609,-11.150805 -11.150804,-11.150805 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
+<svg xml:space="preserve" height="32" viewBox="0 0 147.33262 32" xmlns:dc="http://purl.org/dc/elements/1.1/" width="147.33" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111"><g fill="#fff">
+<path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m104 13v15.344c0 2.008 1.71 3.656 3.72 3.656v-1c-1.52 0-2.72-1.137-2.72-2.656v-15.344h-1zm42 0v8h-4.53c-2.99 0-5.47 2.571-5.47 5.562s2.48 5.466 5.47 5.438h1.78c0.88 0 1.74-0.442 2.44-1.094 0.7-0.651 1.29-1.555 1.31-2.562v-15.344h-1zm-44.5 2c-4.635 0-8.5 3.865-8.5 8.5s3.865 8.5 8.5 8.5v-1c-4.146 0-7.5-3.353-7.5-7.5s3.354-7.5 7.5-7.5v-1zm-46 6c-0.606 0-1.201 0.092-1.75 0.281 0.071 0.325 0.15 0.664 0.188 1 0.489-0.18 1.007-0.281 1.562-0.281 2.503 0 4.5 1.997 4.5 4.5s-1.997 4.5-4.5 4.5c-1.444 0-2.71-0.676-3.531-1.719-0.198 0.255-0.434 0.485-0.657 0.719 1.017 1.208 2.521 2 4.188 2 2.991 0 5.5-2.509 5.5-5.5s-2.509-5.5-5.5-5.5zm7.5 0v7.344c0 2.008 1.992 3.656 4 3.656 1.368 0 2.905-0.695 3.531-1.812 0.622 1.117 2.101 1.812 3.469 1.812 2.008 0 4-1.648 4-3.656v-7.344h-1v7.344c0 1.519-1.481 2.656-3 2.656s-3-1.002-3-2.656v-7.344h-1v7.344c0 1.519-1.48 2.656-3 2.656-1.519 0-3-1.137-3-2.656v-7.344h-1zm22.531 0c-2.991 0-5.531 2.54-5.531 5.531v5.469h1v-5.469c0-2.502 2.029-4.531 4.531-4.531 2.503 0 4.469 2.029 4.469 4.531v5.469h1v-5.469c0-2.991-2.477-5.531-5.469-5.531zm29.969 0c-2.99 0-5.5 2.509-5.5 5.5s2.51 5.5 5.5 5.5 5.5-2.509 5.5-5.5-2.51-5.5-5.5-5.5zm7.5 0v5.562c0 2.991 2.48 5.438 5.47 5.438s5.53-2.447 5.53-5.438v-5.562h-1v5.562c0 2.502-2.03 4.438-4.53 4.438s-4.47-1.936-4.47-4.438v-5.562h-1zm-7.5 1c2.5 0 4.5 1.997 4.5 4.5s-2 4.5-4.5 4.5-4.5-1.997-4.5-4.5 2-4.5 4.5-4.5zm25.97 0h4.53v6.344c-0.01 0.7-0.35 1.387-0.91 1.906-0.55 0.519-1.27 0.75-1.84 0.75h-1.78c-2.5 0-4.47-1.936-4.47-4.438s1.97-4.562 4.47-4.562z" transform="translate(-.0000031714)"/><path d="m16.398 3.6857c-2.2943 0-4.1386 1.8599-4.1386 4.1542 0 0.74283 0.19165 1.4447 0.53099 2.0459 1.3845-0.781 2.9851-1.2338 4.6852-1.2338 0.16408 0 0.32211 0.00666 0.48414 0.015617-0.01834-0.23258-0.03123-0.46554-0.03123-0.70278 0-1.2779 0.27755-2.4937 0.76525-3.592-0.657-0.4403-1.443-0.6871-2.296-0.6871z"/><path d="m7.9805 15.852c-4.4057 0-7.9805 3.5435-7.9805 7.9492s3.5748 7.9805 7.9805 7.9805c1.6769 0 3.2302-0.52246 4.5134-1.4056-0.53024-0.82393-0.84334-1.809-0.84334-2.858 0-0.54446 0.08034-1.0675 0.23426-1.5617-2.4023-1.7361-3.9668-4.5612-3.9668-7.7462 0-0.80924 0.10664-1.5917 0.29673-2.3426-0.078902-0.0023-0.15479-0.01562-0.23426-0.01562z"/><path d="m17.476 9.5578c-4.7826 0-8.652 3.8694-8.652 8.652 0 2.8154 1.3414 5.3078 3.4202 6.8873 0.87636-1.6903 2.6365-2.8424 4.6696-2.8424 0.24572 0 0.48158 0.02978 0.7184 0.06247-0.07434-0.54088-0.10932-1.0943-0.10932-1.6554 0-2.6831 0.87339-5.1644 2.3582-7.1684-0.889-1.112-1.525-2.448-1.796-3.9039-0.201-0.014-0.405-0.0313-0.609-0.0313z"/><path d="m36.045 6.5437c-0.1695 0-0.33288 0.02081-0.49976 0.031235 0.07218 0.45513 0.12494 0.9147 0.12494 1.3899 0 0.7396-0.09406 1.4533-0.2655 2.1396 2.01 1.1123 3.6791 2.7767 4.7789 4.7945 1.1407-0.59386 2.4132-0.97147 3.7638-1.062-0.34807-4.082-3.7298-7.2933-7.9024-7.2933z"/><path d="m26.799 5.1362e-7c-4.4056 0-7.9649 3.5593-7.9649 7.9649 0 1.816 0.60469 3.4874 1.6242 4.8258 2.2117-2.5599 5.4759-4.1855 9.1205-4.1855 1.7831 0 3.474 0.39707 4.9976 1.0932 0.124-0.5582 0.188-1.1384 0.188-1.7338 0-4.4056-3.559-7.9649-7.965-7.9649z"/><path d="m44.588 14.712c-1.4522 0-2.8126 0.37076-4.0137 0.99951 0.682 1.5107 1.062 3.1868 1.062 4.9507 0 3.3027-1.3279 6.3016-3.4827 8.4802 1.583 1.7575 3.8797 2.858 6.4344 2.858 4.7826 0 8.652-3.8694 8.652-8.652 0-4.7827-3.8694-8.6364-8.652-8.6364z"/><path d="m16.914 23.161c-2.415 0-4.3572 1.9422-4.3572 4.3572s1.9422 4.3729 4.3572 4.3729c1.8512 0 3.4224-1.1551 4.0605-2.7799-1.557-1.5857-2.6759-3.6087-3.1703-5.8565-0.28932-0.05983-0.58298-0.09371-0.89019-0.09371z"/><path d="m29.579 9.511c-6.1647 0-11.151 4.9857-11.151 11.151 0 6.1645 4.9858 11.151 11.151 11.151 6.165 0 11.151-4.9864 11.151-11.151 0-6.1651-4.9861-11.151-11.151-11.151z"/></g></svg>
diff --git a/core/img/logo.png b/core/img/logo.png
index a84fe145bbdc5aab34b353dc8bb3163fd54badbe..8d112d99be554002b6fcab41b6468d27e75954b0 100644
Binary files a/core/img/logo.png and b/core/img/logo.png differ
diff --git a/core/img/logo.svg b/core/img/logo.svg
index bd928cccfa28ed2db23d536fee53f87d818341ca..cfb20b60e4f3c2dffb48c1b00131498e6c5444c1 100644
--- a/core/img/logo.svg
+++ b/core/img/logo.svg
@@ -1,759 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="250.00002"
- height="118.22803"
- viewBox="0 0 250.00001 118.22802"
- enable-background="new 0 0 595.275 311.111"
- xml:space="preserve"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="logo-inverted.svg"
- inkscape:export-filename="/home/user/owncloud/core/img/logo-sticker.png"
- inkscape:export-xdpi="300.00223"
- inkscape:export-ydpi="300.00223"><metadata
- id="metadata327"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs325"><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_1_"
- id="linearGradient3353"
- gradientUnits="userSpaceOnUse"
- x1="288.49411"
- y1="55.888199"
- x2="288.49411"
- y2="339.22189" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_2_"
- id="linearGradient3355"
- gradientUnits="userSpaceOnUse"
- x1="251.2114"
- y1="55.888199"
- x2="251.2114"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_3_"
- id="linearGradient3357"
- gradientUnits="userSpaceOnUse"
- x1="293.22461"
- y1="55.888199"
- x2="293.22461"
- y2="339.22171" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_4_"
- id="linearGradient3359"
- gradientUnits="userSpaceOnUse"
- x1="375.33401"
- y1="55.888199"
- x2="375.33401"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_5_"
- id="linearGradient3361"
- gradientUnits="userSpaceOnUse"
- x1="334.49411"
- y1="55.888199"
- x2="334.49411"
- y2="339.22159" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_6_"
- id="linearGradient3363"
- gradientUnits="userSpaceOnUse"
- x1="458.42679"
- y1="55.8867"
- x2="458.42679"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_7_"
- id="linearGradient3365"
- gradientUnits="userSpaceOnUse"
- x1="413.16309"
- y1="55.888199"
- x2="413.16309"
- y2="339.22131" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_8_"
- id="linearGradient3367"
- gradientUnits="userSpaceOnUse"
- x1="290.76169"
- y1="55.8867"
- x2="290.76169"
- y2="339.2236" /><linearGradient
- inkscape:collect="always"
- xlink:href="#SVGID_9_"
- id="linearGradient3369"
- gradientUnits="userSpaceOnUse"
- x1="346.77341"
- y1="55.888199"
- x2="346.77341"
- y2="339.22119" />
- <linearGradient
- y2="339.22189"
- x2="288.49411"
- y1="55.888199"
- x1="288.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_1_">
- <stop
- id="stop261"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop263"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="251.2114"
- y1="55.888199"
- x1="251.2114"
- gradientUnits="userSpaceOnUse"
- id="SVGID_2_">
- <stop
- id="stop268"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop270"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22171"
- x2="293.22461"
- y1="55.888199"
- x1="293.22461"
- gradientUnits="userSpaceOnUse"
- id="SVGID_3_">
- <stop
- id="stop275"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop277"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="375.33401"
- y1="55.888199"
- x1="375.33401"
- gradientUnits="userSpaceOnUse"
- id="SVGID_4_">
- <stop
- id="stop282"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop284"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22159"
- x2="334.49411"
- y1="55.888199"
- x1="334.49411"
- gradientUnits="userSpaceOnUse"
- id="SVGID_5_">
- <stop
- id="stop289"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop291"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="458.42679"
- y1="55.8867"
- x1="458.42679"
- gradientUnits="userSpaceOnUse"
- id="SVGID_6_">
- <stop
- id="stop296"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop298"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22131"
- x2="413.16309"
- y1="55.888199"
- x1="413.16309"
- gradientUnits="userSpaceOnUse"
- id="SVGID_7_">
- <stop
- id="stop303"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop305"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.2236"
- x2="290.76169"
- y1="55.8867"
- x1="290.76169"
- gradientUnits="userSpaceOnUse"
- id="SVGID_8_">
- <stop
- id="stop310"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop312"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
- <linearGradient
- y2="339.22119"
- x2="346.77341"
- y1="55.888199"
- x1="346.77341"
- gradientUnits="userSpaceOnUse"
- id="SVGID_9_">
- <stop
- id="stop317"
- style="stop-color:#BED5E1"
- offset="0" />
- <stop
- id="stop319"
- style="stop-color:#567B8F"
- offset="1" />
- </linearGradient>
-
-</defs><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="774"
- id="namedview323"
- showgrid="false"
- inkscape:zoom="1"
- inkscape:cx="33.895785"
- inkscape:cy="55.236805"
- inkscape:window-x="0"
- inkscape:window-y="26"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1"
- units="mm"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- showguides="true"
- inkscape:guide-bbox="true" />
-<pattern
- y="565.223"
- width="69"
- height="69"
- patternUnits="userSpaceOnUse"
- id="Polka_Dot_Pattern"
- viewBox="2.125 -70.896 69 69"
- overflow="visible">
- <g
- id="g4">
- <polygon
- fill="none"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon6" />
- <polygon
- fill="#F6BB60"
- points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
- id="polygon8" />
- <g
- id="g10">
- <path
- fill="#FFFFFF"
- d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path12" />
- <path
- fill="#FFFFFF"
- d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path14" />
- <path
- fill="#FFFFFF"
- d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path16" />
- <path
- fill="#FFFFFF"
- d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path18" />
- <path
- fill="#FFFFFF"
- d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path20" />
- <path
- fill="#FFFFFF"
- d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path22" />
- <path
- fill="#FFFFFF"
- d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path24" />
- <path
- fill="#FFFFFF"
- d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path26" />
- <path
- fill="#FFFFFF"
- d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path28" />
- </g>
- <g
- id="g30">
- <path
- fill="#FFFFFF"
- d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path32" />
- </g>
- <path
- fill="#FFFFFF"
- d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path34" />
- <g
- id="g36">
- <g
- id="g38">
- <path
- fill="#FFFFFF"
- d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path40" />
- <path
- fill="#FFFFFF"
- d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path42" />
- <path
- fill="#FFFFFF"
- d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path44" />
- <path
- fill="#FFFFFF"
- d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path46" />
- <path
- fill="#FFFFFF"
- d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path48" />
- <path
- fill="#FFFFFF"
- d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path50" />
- <path
- fill="#FFFFFF"
- d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path52" />
- <path
- fill="#FFFFFF"
- d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path54" />
- <path
- fill="#FFFFFF"
- d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path56" />
- <path
- fill="#FFFFFF"
- d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path58" />
- </g>
- <g
- id="g60">
- <path
- fill="#FFFFFF"
- d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path62" />
- <path
- fill="#FFFFFF"
- d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path64" />
- <path
- fill="#FFFFFF"
- d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path66" />
- <path
- fill="#FFFFFF"
- d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path68" />
- <path
- fill="#FFFFFF"
- d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path70" />
- <path
- fill="#FFFFFF"
- d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path72" />
- <path
- fill="#FFFFFF"
- d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path74" />
- <path
- fill="#FFFFFF"
- d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path76" />
- <path
- fill="#FFFFFF"
- d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path78" />
- <path
- fill="#FFFFFF"
- d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path80" />
- </g>
- <g
- id="g82">
- <path
- fill="#FFFFFF"
- d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path84" />
- <path
- fill="#FFFFFF"
- d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path86" />
- <path
- fill="#FFFFFF"
- d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path88" />
- <path
- fill="#FFFFFF"
- d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path90" />
- <path
- fill="#FFFFFF"
- d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path92" />
- <path
- fill="#FFFFFF"
- d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path94" />
- <path
- fill="#FFFFFF"
- d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path96" />
- <path
- fill="#FFFFFF"
- d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path98" />
- <path
- fill="#FFFFFF"
- d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path100" />
- <path
- fill="#FFFFFF"
- d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path102" />
- </g>
- <g
- id="g104">
- <path
- fill="#FFFFFF"
- d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path106" />
- <path
- fill="#FFFFFF"
- d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path108" />
- <path
- fill="#FFFFFF"
- d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path110" />
- <path
- fill="#FFFFFF"
- d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path112" />
- <path
- fill="#FFFFFF"
- d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path114" />
- <path
- fill="#FFFFFF"
- d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path116" />
- <path
- fill="#FFFFFF"
- d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path118" />
- <path
- fill="#FFFFFF"
- d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path120" />
- <path
- fill="#FFFFFF"
- d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C8.15-41.004,8.149-41.02,8.14-41.04"
- id="path122" />
- <path
- fill="#FFFFFF"
- d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path124" />
- </g>
- <g
- id="g126">
- <path
- fill="#FFFFFF"
- d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path128" />
- <path
- fill="#FFFFFF"
- d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path130" />
- <path
- fill="#FFFFFF"
- d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path132" />
- <path
- fill="#FFFFFF"
- d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path134" />
- <path
- fill="#FFFFFF"
- d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path136" />
- <path
- fill="#FFFFFF"
- d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path138" />
- <path
- fill="#FFFFFF"
- d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path140" />
- <path
- fill="#FFFFFF"
- d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path142" />
- <path
- fill="#FFFFFF"
- d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path144" />
- <path
- fill="#FFFFFF"
- d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path146" />
- </g>
- <g
- id="g148">
- <path
- fill="#FFFFFF"
- d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path150" />
- <path
- fill="#FFFFFF"
- d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path152" />
- <path
- fill="#FFFFFF"
- d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path154" />
- <path
- fill="#FFFFFF"
- d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path156" />
- <path
- fill="#FFFFFF"
- d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path158" />
- <path
- fill="#FFFFFF"
- d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path160" />
- <path
- fill="#FFFFFF"
- d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path162" />
- <path
- fill="#FFFFFF"
- d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path164" />
- <path
- fill="#FFFFFF"
- d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path166" />
- <path
- fill="#FFFFFF"
- d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path168" />
- </g>
- <g
- id="g170">
- <path
- fill="#FFFFFF"
- d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path172" />
- <path
- fill="#FFFFFF"
- d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path174" />
- <path
- fill="#FFFFFF"
- d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path176" />
- <path
- fill="#FFFFFF"
- d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path178" />
- <path
- fill="#FFFFFF"
- d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path180" />
- <path
- fill="#FFFFFF"
- d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path182" />
- <path
- fill="#FFFFFF"
- d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path184" />
- <path
- fill="#FFFFFF"
- d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path186" />
- <path
- fill="#FFFFFF"
- d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path188" />
- <path
- fill="#FFFFFF"
- d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path190" />
- </g>
- <g
- id="g192">
- <path
- fill="#FFFFFF"
- d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path194" />
- <path
- fill="#FFFFFF"
- d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path196" />
- <path
- fill="#FFFFFF"
- d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path198" />
- <path
- fill="#FFFFFF"
- d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path200" />
- <path
- fill="#FFFFFF"
- d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path202" />
- <path
- fill="#FFFFFF"
- d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path204" />
- <path
- fill="#FFFFFF"
- d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path206" />
- <path
- fill="#FFFFFF"
- d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path208" />
- <path
- fill="#FFFFFF"
- d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path210" />
- <path
- fill="#FFFFFF"
- d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631 C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path212" />
- </g>
- </g>
- <g
- id="g214">
- <path
- fill="#FFFFFF"
- d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46 c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path216" />
- <path
- fill="#FFFFFF"
- d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path218" />
- <path
- fill="#FFFFFF"
- d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path220" />
- <path
- fill="#FFFFFF"
- d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path222" />
- <path
- fill="#FFFFFF"
- d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path224" />
- <path
- fill="#FFFFFF"
- d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path226" />
- <path
- fill="#FFFFFF"
- d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
- id="path228" />
- <path
- fill="#FFFFFF"
- d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C15.81-2.74,15.809-2.756,15.8-2.776"
- id="path230" />
- <path
- fill="#FFFFFF"
- d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751 C8.15-2.74,8.149-2.756,8.14-2.776"
- id="path232" />
- <path
- fill="#FFFFFF"
- d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46 C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631 C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751 C0.489-2.74,0.488-2.756,0.479-2.776"
- id="path234" />
- </g>
- </g>
-</pattern>
-
-<path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 150.66402,0 c -11.24079,0 -20.32231,9.081511 -20.32231,20.322309 0,4.63349 1.54288,8.898031 4.14416,12.312928 5.64309,-6.531492 13.97179,-10.679174 23.27103,-10.679174 4.54961,0 8.86387,1.013111 12.75126,2.789337 0.31474,-1.423374 0.47817,-2.903724 0.47817,-4.423091 C 170.98633,9.081511 161.90482,0 150.66402,0 z m -26.53854,9.404049 c -5.8539,0 -10.55964,4.745576 -10.55964,10.599479 0,1.89532 0.48899,3.686187 1.35482,5.220044 3.53247,-1.99271 7.6164,-3.147966 11.9543,-3.147966 0.41864,0 0.82186,0.01699 1.23528,0.03985 -0.0468,-0.593428 -0.0797,-1.187821 -0.0797,-1.793145 0,-3.260488 0.70816,-6.362694 1.95253,-9.164963 -1.67544,-1.123499 -3.68279,-1.753297 -5.8576,-1.753297 z m 50.12836,7.292122 c -0.43247,0 -0.84934,0.05309 -1.27513,0.0797 0.18418,1.16127 0.31878,2.33386 0.31878,3.546442 0,1.887099 -0.24,3.708046 -0.67741,5.45913 5.1284,2.83813 9.38734,7.08467 12.19339,12.233233 2.91052,-1.515226 6.15729,-2.47869 9.60329,-2.709641 -0.8881,-10.415209 -9.51665,-18.60886 -20.16292,-18.60886 z m -16.49694,7.571057 c -15.72924,0 -28.45123,12.720931 -28.45123,28.451232 0,15.728607 12.72134,28.451231 28.45123,28.451231 15.7299,0 28.45124,-12.72265 28.45124,-28.451231 0,-15.730273 -12.72199,-28.451232 -28.45124,-28.451232 z m -30.88194,0.119543 c -12.20291,0 -22.0756,9.87269 -22.0756,22.075606 0,7.183598 3.4227,13.542949 8.72664,17.57282 2.23603,-4.312671 6.727,-7.252275 11.91445,-7.252275 0.62695,0 1.22873,0.07599 1.83299,0.159391 -0.18969,-1.380056 -0.27893,-2.791988 -0.27893,-4.223853 0,-6.846031 2.22844,-13.176829 6.01699,-18.290078 -2.26779,-2.837739 -3.89072,-6.247406 -4.58248,-9.961916 -0.51269,-0.03551 -1.03226,-0.0797 -1.55406,-0.0797 z M 196.05051,37.5365 c -3.70536,0 -7.17634,0.945989 -10.24085,2.550251 1.74013,3.854499 2.70964,8.131195 2.70964,12.631709 0,8.42684 -3.38806,16.078501 -8.88603,21.637282 4.039,4.484129 9.89911,7.292119 16.41724,7.292119 12.20291,0 22.07561,-9.872692 22.07561,-22.075602 0,-12.202916 -9.8727,-22.035759 -22.07561,-22.035759 z m -93.40293,2.90888 c -11.24112,0 -20.36215,9.041344 -20.36215,20.282461 0,11.241122 9.12103,20.36216 20.36215,20.36216 4.27853,0 8.24193,-1.33304 11.51598,-3.58629 -1.3529,-2.102251 -2.15177,-4.615612 -2.15177,-7.292126 0,-1.389185 0.20497,-2.723795 0.59771,-3.984766 -6.12935,-4.429596 -10.12131,-11.637922 -10.12131,-19.764442 0,-2.064771 0.27209,-4.061306 0.75711,-5.97715 -0.20132,-0.0058 -0.39495,-0.03985 -0.59772,-0.03985 z m 119.50315,17.453277 c -0.59968,0 -1.17994,0.06831 -1.7533,0.15939 0.0316,0.506877 0.0398,0.999386 0.0398,1.514212 0,6.481551 -2.55739,12.364405 -6.69441,16.736019 2.03527,2.366783 5.02479,3.865223 8.40786,3.865223 6.16229,0 11.15735,-4.955213 11.15735,-11.117498 0,-6.162288 -4.99506,-11.157346 -11.15735,-11.157346 z m -96.71028,1.19543 c -6.16197,0 -11.1175,4.955527 -11.1175,11.117498 0,6.161966 4.95553,11.157346 11.1175,11.157346 4.72323,0 8.73232,-2.94722 10.36039,-7.092884 -3.97255,-4.045998 -6.82757,-9.207657 -8.08907,-14.942874 -0.73821,-0.152657 -1.48749,-0.239086 -2.27132,-0.239086 z m 122.21279,9.364201 0,22.035763 -11.67537,0 c -7.63217,0 -13.82714,6.23473 -13.82714,13.866979 0,7.63109 6.19497,13.82714 13.82714,13.82714 l 3.38705,0 1.15558,0 c 2.239,0 4.47478,-1.08741 6.25609,-2.74949 1.78131,-1.66207 3.14086,-3.96444 3.18781,-6.53501 0.0801,-4.41219 0,-17.254039 0,-17.254039 l 0,-0.55787 0,-22.633473 -2.31116,0 z m -106.7519,9.961913 0,30.483469 c 0,5.12322 4.20109,9.2845 9.32436,9.2845 l 0,-2.31116 c -3.87663,0 -7.01319,-3.09673 -7.01319,-6.97334 l 0,-29.048949 c -0.80461,-0.4325 -1.55141,-0.93449 -2.31117,-1.43452 z m -23.11164,2.82919 c -4.09351,3.90587 -6.65456,9.40526 -6.65456,15.50074 0,11.827049 9.61175,21.438039 21.43804,21.438039 l 0,-2.31116 c -10.57945,0 -19.12688,-8.54692 -19.12688,-19.126879 0,-5.69048 2.48389,-10.80462 6.41548,-14.30531 -0.73485,-0.33851 -1.4155,-0.73502 -2.07208,-1.19543 z m -27.21596,9.16496 c -7.63218,0 -13.82714,6.19489 -13.82714,13.827139 l 0,12.7911 2.31117,0 0,-12.7911 c 0,-6.385199 5.13086,-11.555819 11.51597,-11.555819 6.38636,0 11.55582,5.17062 11.55582,11.555819 l 0,12.7911 2.31117,0 0,-12.7911 c 0,-7.632249 -6.23376,-13.827139 -13.86699,-13.827139 z m 77.5834,0.0797 c -7.6326,0 -13.82713,6.23438 -13.82713,13.866979 0,7.63262 6.19453,13.86699 13.82713,13.86699 7.63262,0 13.86699,-6.23437 13.86699,-13.86699 0,-7.632599 -6.23437,-13.866979 -13.86699,-13.866979 z m -154.290153,0.0398 c -7.6319743,0 -13.86698728410754,6.19517 -13.86698728410754,13.827139 0,7.63198 6.23501298410754,13.82714 13.86698728410754,13.82714 7.631973,0 13.82714,-6.19516 13.82714,-13.82714 0,-7.631969 -6.195167,-13.827139 -13.82714,-13.827139 z m 20.760634,1.03604 0,17.333739 c 0,5.12342 4.162235,9.2845 9.284505,9.2845 3.491222,0 6.571552,-1.93031 8.168772,-4.78172 1.585655,2.85141 4.638381,4.78172 8.128923,4.78172 5.123264,0 9.324349,-4.16108 9.324349,-9.2845 l 0,-17.333739 -2.31116,0 0,17.333739 c 0,3.8764 -3.136557,6.97334 -7.013189,6.97334 -3.876637,0 -6.973341,-3.09694 -6.973341,-6.97334 l 0,-17.333739 -2.311165,0 0,17.333739 c 0,3.87661 -3.135236,6.97334 -7.013189,6.97334 -3.875319,0 -6.973341,-3.09694 -6.973341,-6.97334 l 0,-17.333739 -2.311164,0 z m 153.453359,0 0,12.791099 c 0,7.63109 6.19496,13.82714 13.82714,13.82714 7.63218,0 13.86698,-6.19592 13.86698,-13.82714 l 0,-12.791099 -2.31116,0 0,12.791099 c 0,6.38369 -5.17071,11.51598 -11.55582,11.51598 -6.3851,0 -11.51598,-5.13216 -11.51598,-11.51598 l 0,-12.791099 -2.31116,0 z m -19.92384,1.23528 c 6.38563,0 11.55583,5.17021 11.55583,11.555819 0,6.38563 -5.1702,11.55583 -11.55583,11.55583 -6.38561,0 -11.51597,-5.1702 -11.51597,-11.55583 0,-6.385609 5.13036,-11.555819 11.51597,-11.555819 z m 67.82073,0 11.67537,0 c 0.009,1.52706 0.0728,12.045619 0,16.058609 -0.0326,1.78576 -1.01212,3.57763 -2.43071,4.90126 -1.41859,1.32363 -3.25441,2.11193 -4.70203,2.11193 l -4.54263,0 c -6.3851,0 -11.51598,-5.13216 -11.51598,-11.51598 0,-6.385199 5.13088,-11.555819 11.51598,-11.555819 z m -222.110883,0.0399 c 6.384977,0 11.515975,5.131 11.515975,11.515969 0,6.38499 -5.130998,11.51598 -11.515975,11.51598 -6.3849773,0 -11.5558223,-5.13099 -11.5558223,-11.51598 0,-6.384969 5.170845,-11.515969 11.5558223,-11.515969 z"
- id="circle238"
- inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
+<svg xml:space="preserve" height="118.23" viewBox="0 0 250.00001 118.22802" xmlns:dc="http://purl.org/dc/elements/1.1/" width="250" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111">
+<path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m150.66 0c-11.241 0-20.322 9.0815-20.322 20.322 0 4.6335 1.5429 8.898 4.1442 12.313 5.6431-6.5315 13.972-10.679 23.271-10.679 4.5496 0 8.8639 1.0131 12.751 2.7893 0.31474-1.4234 0.47817-2.9037 0.47817-4.4231 0.01-11.24-9.08-20.322-20.32-20.322zm-26.539 9.404c-5.8539 0-10.56 4.7456-10.56 10.599 0 1.8953 0.48899 3.6862 1.3548 5.22 3.5325-1.9927 7.6164-3.148 11.954-3.148 0.41864 0 0.82186 0.01699 1.2353 0.03985-0.0468-0.59343-0.0797-1.1878-0.0797-1.7931 0-3.2605 0.70816-6.3627 1.9525-9.165-1.6754-1.1235-3.6828-1.7533-5.8576-1.7533zm50.128 7.2921c-0.43247 0-0.84934 0.05309-1.2751 0.0797 0.18418 1.1613 0.31878 2.3339 0.31878 3.5464 0 1.8871-0.24 3.708-0.67741 5.4591 5.1284 2.8381 9.3873 7.0847 12.193 12.233 2.9105-1.5152 6.1573-2.4787 9.6033-2.7096-0.8881-10.415-9.5166-18.609-20.163-18.609zm-16.497 7.5711c-15.729 0-28.451 12.721-28.451 28.451 0 15.729 12.721 28.451 28.451 28.451s28.451-12.723 28.451-28.451c0-15.73-12.722-28.451-28.451-28.451zm-30.882 0.11954c-12.203 0-22.076 9.8727-22.076 22.076 0 7.1836 3.4227 13.543 8.7266 17.573 2.236-4.3127 6.727-7.2523 11.914-7.2523 0.62695 0 1.2287 0.07599 1.833 0.15939-0.18969-1.3801-0.27893-2.792-0.27893-4.2239 0-6.846 2.2284-13.177 6.017-18.29-2.2678-2.8377-3.8907-6.2474-4.5825-9.9619-0.51269-0.03551-1.0323-0.0797-1.5541-0.0797zm69.18 13.149c-3.7054 0-7.1763 0.94599-10.241 2.5503 1.7401 3.8545 2.7096 8.1312 2.7096 12.632 0 8.4268-3.3881 16.079-8.886 21.637 4.039 4.4841 9.8991 7.2921 16.417 7.2921 12.203 0 22.076-9.8727 22.076-22.076s-9.8727-22.036-22.076-22.036zm-93.403 2.9089c-11.241 0-20.362 9.0413-20.362 20.282s9.121 20.362 20.362 20.362c4.2785 0 8.2419-1.333 11.516-3.5863-1.3529-2.1023-2.1518-4.6156-2.1518-7.2921 0-1.3892 0.20497-2.7238 0.59771-3.9848-6.1294-4.4296-10.121-11.638-10.121-19.764 0-2.0648 0.27209-4.0613 0.75711-5.9772-0.20132-0.0058-0.39495-0.03985-0.59772-0.03985zm119.5 17.453c-0.59968 0-1.1799 0.06831-1.7533 0.15939 0.0316 0.50688 0.0398 0.99939 0.0398 1.5142 0 6.4816-2.5574 12.364-6.6944 16.736 2.0353 2.3668 5.0248 3.8652 8.4079 3.8652 6.1623 0 11.157-4.9552 11.157-11.117 0-6.1623-4.9951-11.157-11.157-11.157zm-96.71 1.1954c-6.162 0-11.118 4.9555-11.118 11.117 0 6.162 4.9555 11.157 11.118 11.157 4.7232 0 8.7323-2.9472 10.36-7.0929-3.9726-4.046-6.8276-9.2077-8.0891-14.943-0.73821-0.15266-1.4875-0.23909-2.2713-0.23909zm122.21 9.3642v22.036h-11.675c-7.6322 0-13.827 6.2347-13.827 13.867 0 7.6311 6.195 13.827 13.827 13.827h3.387 1.1556c2.239 0 4.4748-1.0874 6.2561-2.7495s3.1409-3.9644 3.1878-6.535c0.0801-4.4122 0-17.254 0-17.254v-0.55787-22.633h-2.3112zm-106.75 9.9619v30.483c0 5.1232 4.2011 9.2845 9.3244 9.2845v-2.3112c-3.8766 0-7.0132-3.0967-7.0132-6.9733v-29.049c-0.80461-0.4325-1.5514-0.93449-2.3112-1.4345zm-23.112 2.8292c-4.0935 3.9059-6.6546 9.4053-6.6546 15.501 0 11.827 9.6118 21.438 21.438 21.438v-2.3112c-10.579 0-19.127-8.5469-19.127-19.127 0-5.6905 2.4839-10.805 6.4155-14.305-0.73485-0.33851-1.4155-0.73502-2.0721-1.1954zm-27.216 9.165c-7.6322 0-13.827 6.1949-13.827 13.827v12.791h2.3112v-12.791c0-6.3852 5.1309-11.556 11.516-11.556 6.3864 0 11.556 5.1706 11.556 11.556v12.791h2.3112v-12.791c0-7.6322-6.2338-13.827-13.867-13.827zm77.583 0.0797c-7.6326 0-13.827 6.2344-13.827 13.867s6.1945 13.867 13.827 13.867c7.6326 0 13.867-6.2344 13.867-13.867s-6.2344-13.867-13.867-13.867zm-154.29 0.0398c-7.632 0-13.867 6.1952-13.867 13.827 0 7.632 6.235 13.827 13.867 13.827s13.827-6.1952 13.827-13.827c0-7.632-6.1952-13.827-13.827-13.827zm20.761 1.036v17.334c0 5.1234 4.1622 9.2845 9.2845 9.2845 3.4912 0 6.5716-1.9303 8.1688-4.7817 1.5857 2.8514 4.6384 4.7817 8.1289 4.7817 5.1233 0 9.3243-4.1611 9.3243-9.2845v-17.334h-2.3112v17.334c0 3.8764-3.1366 6.9733-7.0132 6.9733s-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112v17.334c0 3.8766-3.1352 6.9733-7.0132 6.9733-3.8753 0-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112zm153.45 0v12.791c0 7.6311 6.195 13.827 13.827 13.827 7.6322 0 13.867-6.1959 13.867-13.827v-12.791h-2.3112v12.791c0 6.3837-5.1707 11.516-11.556 11.516-6.3851 0-11.516-5.1322-11.516-11.516v-12.791h-2.3112zm-19.924 1.2353c6.3856 0 11.556 5.1702 11.556 11.556 0 6.3856-5.1702 11.556-11.556 11.556-6.3856 0-11.516-5.1702-11.516-11.556 0-6.3856 5.1304-11.556 11.516-11.556zm67.821 0h11.675c0.009 1.5271 0.0728 12.046 0 16.059-0.0326 1.7858-1.0121 3.5776-2.4307 4.9013-1.4186 1.3236-3.2544 2.1119-4.702 2.1119h-4.5426c-6.3851 0-11.516-5.1322-11.516-11.516 0-6.3852 5.1309-11.556 11.516-11.556zm-222.11 0.0399c6.385 0 11.516 5.131 11.516 11.516s-5.131 11.516-11.516 11.516-11.556-5.131-11.556-11.516 5.1708-11.516 11.556-11.516z" fill="#fff"/>
+</svg>
diff --git a/core/img/noise.png b/core/img/noise.png
index 271dd5ebcfbdc858f83f0f7ea18a59bb1980d74f..6c06c8a4d6d0874e78211acbafcf0ca9e77a7017 100644
Binary files a/core/img/noise.png and b/core/img/noise.png differ
diff --git a/core/img/places/calendar-dark.png b/core/img/places/calendar-dark.png
index e372104a28482c72ff9e2113f5b77e36a7a9ea88..920dee610dd3b71f2fdde988eeaf0945b31fd544 100644
Binary files a/core/img/places/calendar-dark.png and b/core/img/places/calendar-dark.png differ
diff --git a/core/img/places/calendar-dark.svg b/core/img/places/calendar-dark.svg
index 6f7cb8e74d7dfeb65e12a8c7524418bee7035ed9..986be039ab9b6e3c323830624c1b2a17c7c487a3 100644
--- a/core/img/places/calendar-dark.svg
+++ b/core/img/places/calendar-dark.svg
@@ -1,75 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg4375"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="calendar-dark.svg"
- inkscape:export-filename="calendar-dark.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4377" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.313709"
- inkscape:cx="16.386906"
- inkscape:cy="22.866321"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4380">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(580.71429,-1.576468)">
- <path
- sodipodi:nodetypes="sssssssssssssscssscsssssscsssccsssssssss"
- id="path2995"
- d="m -572.71429,4.576468 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m 16,0 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m -13,4 0,2 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-1.875 c -1.72799,0.4425402 -3,2.00525 -3,3.875 l 0,16 c 0,2.216 1.784,4 4,4 l 20,0 c 2.216,0 4,-1.784 4,-4 l 0,-16 c 0,-1.86975 -1.27201,-3.4324598 -3,-3.875 l 0,1.875 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-2 z m -4.90615,10.000125 19.8123,0 c 0.0554,0 0.0937,0.03835 0.0937,0.09375 l 0,9.81225 c 0,0.05539 -0.0384,0.09375 -0.0937,0.09375 l -19.8123,0 c -0.0554,0 -0.0937,-0.03835 -0.0937,-0.09375 l 0,-9.81225 c 0,-0.05543 0.0384,-0.09375 0.0937,-0.09375 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:none"
- d="m -572.71429,3.576468 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m 16,0 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m -13,4 0,2 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-1.875 c -1.72799,0.4425402 -3,2.00525 -3,3.875 l 0,16 c 0,2.216 1.784,4 4,4 l 20,0 c 2.216,0 4,-1.784 4,-4 l 0,-16 c 0,-1.86975 -1.27201,-3.4324598 -3,-3.875 l 0,1.875 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-2 z m -4.90615,10.000125 19.8123,0 c 0.0554,0 0.0937,0.03835 0.0937,0.09375 l 0,9.81225 c 0,0.05539 -0.0384,0.09375 -0.0937,0.09375 l -19.8123,0 c -0.0554,0 -0.0937,-0.03835 -0.0937,-0.09375 l 0,-9.81225 c 0,-0.05543 0.0384,-0.09375 0.0937,-0.09375 z"
- id="path3763"
- sodipodi:nodetypes="sssssssssssssscssscsssssscsssccsssssssss" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(580.71 -1.5765)">
+ <path d="m-572.71 4.5765c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875c-1.728 0.44254-3 2.0052-3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16c0-1.8698-1.272-3.4325-3-3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2zm-4.9062 10h19.812c0.0554 0 0.0937 0.03835 0.0937 0.09375v9.8122c0 0.05539-0.0384 0.09375-0.0937 0.09375h-19.812c-0.0554 0-0.0937-0.03835-0.0937-0.09375v-9.8122c0-0.05543 0.0384-0.09375 0.0937-0.09375z" fill="#fff"/>
+ <path d="m-572.71 3.5765c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875c-1.728 0.44254-3 2.0052-3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16c0-1.8698-1.272-3.4325-3-3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2zm-4.9062 10h19.812c0.0554 0 0.0937 0.03835 0.0937 0.09375v9.8122c0 0.05539-0.0384 0.09375-0.0937 0.09375h-19.812c-0.0554 0-0.0937-0.03835-0.0937-0.09375v-9.8122c0-0.05543 0.0384-0.09375 0.0937-0.09375z"/>
+ </g>
</svg>
diff --git a/core/img/places/contacts-dark.svg b/core/img/places/contacts-dark.svg
index df364911c519e617ecdee7dca235072513107705..3fc10cfe08f040abb1bb5edba44fc638e12224c8 100644
--- a/core/img/places/contacts-dark.svg
+++ b/core/img/places/contacts-dark.svg
@@ -1,73 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3301"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="contacts-dark.svg"
- inkscape:export-filename="contacts-dark.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3303" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.313708"
- inkscape:cx="20.488654"
- inkscape:cy="17.050062"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata3306">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-359.05493,-515.86218)">
- <path
- inkscape:connector-curvature="0"
- id="path2995"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 368.28616,523.52657 c -1.95489,0 -3.61329,1.42966 -3.61329,3.27468 0.0139,0.58316 0.066,1.30227 0.41402,2.82301 l 0,0.0376 0.0377,0.0377 c 0.11171,0.32 0.27429,0.50305 0.4893,0.7528 0.21502,0.24974 0.47136,0.54371 0.71513,0.79045 0.0288,0.029 0.047,0.0469 0.0752,0.0753 0.0483,0.21038 0.1069,0.43679 0.15055,0.63988 0.11614,0.54034 0.10423,0.92299 0.0752,1.05392 -0.84004,0.29496 -1.88513,0.64623 -2.82289,1.05393 -0.52647,0.22889 -1.00287,0.43328 -1.39261,0.67751 -0.38974,0.24425 -0.77735,0.42877 -0.90332,0.97865 -0.002,0.025 -0.002,0.0502 0,0.0753 -0.1231,1.13039 -0.30932,2.79261 -0.45166,3.91458 -0.0307,0.23616 0.0937,0.48512 0.3011,0.60223 1.70267,0.91975 4.31819,1.28993 6.92547,1.27976 2.60727,-0.0102 5.20196,-0.4021 6.85019,-1.27976 0.20736,-0.11711 0.33184,-0.36607 0.3011,-0.60223 -0.0454,-0.35072 -0.10126,-1.14154 -0.15055,-1.91966 -0.0493,-0.77812 -0.092,-1.54354 -0.15055,-1.99492 -0.0204,-0.1119 -0.0734,-0.21766 -0.15056,-0.30112 -0.52359,-0.62524 -1.30583,-1.00746 -2.22067,-1.39269 -0.83517,-0.35169 -1.81429,-0.71689 -2.78523,-1.1292 -0.0543,-0.12106 -0.10833,-0.47327 0,-1.01628 0.029,-0.1458 0.0747,-0.30196 0.11292,-0.45168 0.0913,-0.1022 0.16236,-0.18571 0.26346,-0.30112 0.21564,-0.24614 0.44734,-0.50432 0.63986,-0.7528 0.19251,-0.24849 0.35001,-0.46165 0.45166,-0.7528 l 0.0377,-0.0376 c 0.39341,-1.58787 0.39363,-2.25045 0.41403,-2.82301 l 0,-0.0377 c 0,-1.84501 -1.6584,-3.27468 -3.61329,-3.27468 z m 10.33571,-3.00497 c -2.85015,0 -5.26802,2.08432 -5.26802,4.77416 0.0202,0.85019 0.0963,1.89859 0.60362,4.11566 l 0,0.0549 0.0549,0.0549 c 0.16287,0.46651 0.39989,0.73339 0.71338,1.0975 0.31349,0.36411 0.68722,0.79267 1.04262,1.15239 0.0418,0.0423 0.0686,0.0686 0.10975,0.10977 0.0705,0.3067 0.15586,0.63679 0.21951,0.93288 0.16931,0.78776 0.15194,1.34562 0.10976,1.5365 -1.22474,0.43004 -2.74844,0.94215 -4.11565,1.53651 -0.76758,0.3337 -1.46216,0.63168 -2.03038,0.98778 -0.56823,0.35608 -1.13334,0.6251 -1.31701,1.42675 -0.003,0.0365 -0.003,0.0733 0,0.10977 -0.17948,1.64799 -0.45098,4.07134 -0.6585,5.70704 -0.0448,0.34431 0.13667,0.70727 0.439,0.87801 2.48242,1.34091 6.29573,1.88059 10.09705,1.86576 3.8013,-0.0148 7.58424,-0.58622 9.98729,-1.86576 0.30232,-0.17074 0.4838,-0.5337 0.439,-0.87801 -0.0663,-0.51129 -0.14765,-1.66422 -0.21951,-2.79864 -0.0719,-1.13442 -0.13422,-2.25035 -0.21948,-2.90841 -0.0298,-0.16311 -0.10688,-0.31733 -0.2195,-0.43899 -0.76337,-0.91154 -1.90387,-1.46878 -3.23765,-2.0304 -1.21766,-0.51271 -2.64517,-1.04515 -4.06077,-1.64625 -0.0791,-0.1765 -0.15794,-0.69001 0,-1.48165 0.0424,-0.21256 0.10883,-0.44024 0.16463,-0.65849 0.13304,-0.14901 0.23672,-0.27077 0.38413,-0.43901 0.3144,-0.35883 0.6522,-0.73526 0.93288,-1.09751 0.28067,-0.36226 0.51031,-0.67304 0.65849,-1.09752 l 0.0549,-0.0549 c 0.57359,-2.31494 0.57389,-3.28093 0.60364,-4.11566 l 0,-0.0549 c 0,-2.68983 -2.41788,-4.77415 -5.26803,-4.77415 z" />
- <path
- d="m 368.28616,522.52661 c -1.95489,0 -3.61329,1.42966 -3.61329,3.27468 0.0139,0.58316 0.066,1.30227 0.41402,2.82301 l 0,0.0376 0.0377,0.0377 c 0.11171,0.32 0.27429,0.50305 0.4893,0.7528 0.21502,0.24974 0.47136,0.54371 0.71513,0.79045 0.0288,0.029 0.047,0.0469 0.0752,0.0753 0.0483,0.21038 0.1069,0.43679 0.15055,0.63988 0.11614,0.54034 0.10423,0.92299 0.0752,1.05392 -0.84004,0.29496 -1.88513,0.64623 -2.82289,1.05393 -0.52647,0.22889 -1.00287,0.43328 -1.39261,0.67751 -0.38974,0.24425 -0.77735,0.42877 -0.90332,0.97865 -0.002,0.025 -0.002,0.0502 0,0.0753 -0.1231,1.13039 -0.30932,2.79261 -0.45166,3.91458 -0.0307,0.23616 0.0937,0.48512 0.3011,0.60223 1.70267,0.91975 4.31819,1.28993 6.92547,1.27976 2.60727,-0.0102 5.20196,-0.4021 6.85019,-1.27976 0.20736,-0.11711 0.33184,-0.36607 0.3011,-0.60223 -0.0454,-0.35072 -0.10126,-1.14154 -0.15055,-1.91966 -0.0493,-0.77812 -0.092,-1.54354 -0.15055,-1.99492 -0.0204,-0.1119 -0.0734,-0.21766 -0.15056,-0.30112 -0.52359,-0.62524 -1.30583,-1.00746 -2.22067,-1.39269 -0.83517,-0.35169 -1.81429,-0.71689 -2.78523,-1.1292 -0.0543,-0.12106 -0.10833,-0.47327 0,-1.01628 0.029,-0.1458 0.0747,-0.30196 0.11292,-0.45168 0.0913,-0.1022 0.16236,-0.18571 0.26346,-0.30112 0.21564,-0.24614 0.44734,-0.50432 0.63986,-0.7528 0.19251,-0.24849 0.35001,-0.46165 0.45166,-0.7528 l 0.0377,-0.0376 c 0.39341,-1.58787 0.39363,-2.25045 0.41403,-2.82301 l 0,-0.0377 c 0,-1.84501 -1.6584,-3.27468 -3.61329,-3.27468 z m 10.33571,-3.00497 c -2.85015,0 -5.26802,2.08432 -5.26802,4.77416 0.0202,0.85019 0.0963,1.89859 0.60362,4.11566 l 0,0.0549 0.0549,0.0549 c 0.16287,0.46651 0.39989,0.73339 0.71338,1.0975 0.31349,0.36411 0.68722,0.79267 1.04262,1.15239 0.0418,0.0423 0.0686,0.0686 0.10975,0.10977 0.0705,0.3067 0.15586,0.63679 0.21951,0.93288 0.16931,0.78776 0.15194,1.34562 0.10976,1.5365 -1.22474,0.43004 -2.74844,0.94215 -4.11565,1.53651 -0.76758,0.3337 -1.46216,0.63168 -2.03038,0.98778 -0.56823,0.35608 -1.13334,0.6251 -1.31701,1.42675 -0.003,0.0365 -0.003,0.0733 0,0.10977 -0.17948,1.64799 -0.45098,4.07134 -0.6585,5.70704 -0.0448,0.34431 0.13667,0.70727 0.439,0.87801 2.48242,1.34091 6.29573,1.88059 10.09705,1.86576 3.8013,-0.0148 7.58424,-0.58622 9.98729,-1.86576 0.30232,-0.17074 0.4838,-0.5337 0.439,-0.87801 -0.0663,-0.51129 -0.14765,-1.66422 -0.21951,-2.79864 -0.0719,-1.13442 -0.13422,-2.25035 -0.21948,-2.90841 -0.0298,-0.16311 -0.10688,-0.31733 -0.2195,-0.43899 -0.76337,-0.91154 -1.90387,-1.46878 -3.23765,-2.0304 -1.21766,-0.51271 -2.64517,-1.04515 -4.06077,-1.64625 -0.0791,-0.1765 -0.15794,-0.69001 0,-1.48165 0.0424,-0.21256 0.10883,-0.44024 0.16463,-0.65849 0.13304,-0.14901 0.23672,-0.27077 0.38413,-0.43901 0.3144,-0.35883 0.6522,-0.73526 0.93288,-1.09751 0.28067,-0.36226 0.51031,-0.67304 0.65849,-1.09752 l 0.0549,-0.0549 c 0.57359,-2.31494 0.57389,-3.28093 0.60364,-4.11566 l 0,-0.0549 c 0,-2.68983 -2.41788,-4.77415 -5.26803,-4.77415 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- id="path3763"
- inkscape:connector-curvature="0" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(-359.05 -515.86)">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m368.29 523.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z" fill="#fff"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m368.29 522.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z"/>
+ </g>
</svg>
diff --git a/core/img/places/file.svg b/core/img/places/file.svg
index 478714b75d105735a987b4ea92d6447014c8c673..f93f3ef6faea6eb62d979a77efaae857fec83b70 100644
--- a/core/img/places/file.svg
+++ b/core/img/places/file.svg
@@ -1,1841 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="folder.svg"
- inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/folder.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="14.025105"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4566-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- id="linearGradient3587-6-5-26">
- <stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- id="linearGradient4580-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-1"
- id="linearGradient4578-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2-1">
- <stop
- id="stop3589-9-2-8-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="1013.451"
- x2="209.34245"
- y1="998.45801"
- x1="209.34245"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3528"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- id="linearGradient3335-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-4">
- <stop
- id="stop3589-9-2-8-7-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-6"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3567"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- inkscape:collect="always" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <g
- transform="translate(-3.1068569e-8,20)"
- id="g3546">
- <path
- sodipodi:nodetypes="ccccccccccccscccccssss"
- inkscape:connector-curvature="0"
- id="path4160-9-8"
- d="m 3.3500571,-17.998043 c -0.1974696,0.03825 -0.3535533,0.233327 -0.3499974,0.437439 l 0,13.123165 c 4.7e-6,0.229041 0.205219,0.437433 0.430766,0.437439 l 10.1387373,0 c 0.225547,-6e-6 0.43076,-0.208398 0.430766,-0.437439 l 0,-10.143113 c -0.0033,-0.06685 -0.02179,-0.132893 -0.05384,-0.191379 -0.965556,-1.389642 -2.035099,-2.419138 -3.311513,-3.198772 -0.04304,-0.01632 -0.08869,-0.02559 -0.134615,-0.02734 l -7.0695295,0 c -0.026843,-0.0026 -0.053928,-0.0026 -0.080774,0 z M 9.0000021,-15.5 c 0,-0.235702 0.2642971,-0.5 0.4999991,-0.5 0.235702,0 0.2493941,0 0.4999988,0 0,0.24431 0,2 0,2 0,0 1.684071,0 2,0 0,0.287357 0,0.264298 0,0.5 0,0.235702 -0.264298,0.5 -0.5,0.5 -0.401508,0 -1.438744,0 -1.9999998,0 -0.2357023,0 -0.5,-0.264298 -0.5,-0.5 0,-0.464108 1.9e-6,-1.491737 1.9e-6,-2 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992162;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- <path
- sodipodi:nodetypes="ccccccccccccscccccssss"
- inkscape:connector-curvature="0"
- id="path4160-9"
- d="m 3.350057,-18.998043 c -0.1974696,0.03825 -0.3535533,0.233327 -0.3499974,0.437439 l 0,13.123165 c 4.7e-6,0.229041 0.205219,0.437433 0.430766,0.437439 l 10.1387374,0 c 0.225547,-6e-6 0.43076,-0.208398 0.430766,-0.437439 l 0,-10.143113 c -0.0033,-0.06685 -0.02179,-0.132893 -0.05384,-0.191379 -0.965556,-1.389642 -2.035099,-2.419138 -3.311513,-3.198772 -0.04304,-0.01632 -0.08869,-0.02559 -0.134615,-0.02734 l -7.0695296,0 c -0.026843,-0.0026 -0.053928,-0.0026 -0.080774,0 z M 9.000002,-16.5 c 0,-0.235702 0.2642971,-0.5 0.4999991,-0.5 0.235702,0 0.2493941,0 0.4999989,0 0,0.24431 0,2 0,2 0,0 1.684071,0 2,0 0,0.287357 0,0.264298 0,0.5 0,0.235702 -0.264298,0.5 -0.5,0.5 -0.401508,0 -1.438744,0 -1.9999999,0 -0.2357023,0 -0.5,-0.264298 -0.5,-0.5 0,-0.464108 1.9e-6,-1.491737 1.9e-6,-2 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:url(#linearGradient3567);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992162;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- </g>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="54.703" gradientUnits="userSpaceOnUse" y1="2.2401" gradientTransform="matrix(.21864 0 0 .26685 18.619 -19.598)" x2="-41.553" x1="-41.553">
+ <stop offset="0"/>
+ <stop stop-color="#363636" offset="1"/>
+ </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g transform="translate(-3.1069e-8 20)">
+ <path opacity=".6" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m3.3501-17.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="#fff"/>
+ <path opacity=".7" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m3.3501-18.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="url(#a)"/>
+ </g>
</svg>
diff --git a/core/img/places/files.png b/core/img/places/files.png
index 9c7ff2642f91b06a93376754d762f402e3f36581..52e0c6bf949ca5021b22b36b9753d16faedee8ed 100644
Binary files a/core/img/places/files.png and b/core/img/places/files.png differ
diff --git a/core/img/places/files.svg b/core/img/places/files.svg
index 8ebf861f6d5264d164326e9cf4c6a372881cac4c..d446ef655aece49a9763837a2ad9a74a25bd7623 100644
--- a/core/img/places/files.svg
+++ b/core/img/places/files.svg
@@ -1,128 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg3349"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="files.svg"
- inkscape:export-filename="files.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3351">
- <linearGradient
- id="linearGradient3754">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3756" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.70779222;"
- offset="1"
- id="stop3758" />
- </linearGradient>
- <linearGradient
- y2="1013.451"
- x2="209.34245"
- y1="998.45801"
- x1="209.34245"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3528"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6-3" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-2-1">
- <stop
- id="stop3589-9-2-8-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="16"
- inkscape:cx="9.6005683"
- inkscape:cy="17.34375"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid4530"
- empspacing="4"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- dotted="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata3354">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(573.14286,110.2963)">
- <path
- inkscape:connector-curvature="0"
- d="m -570.22204,-108.29572 c -0.50115,0 -0.92082,0.41966 -0.92082,0.92081 l 0,24.157882 c 0,0.51739 0.40324,0.920728 0.92082,0.920728 l 26.15768,0 c 0.51756,0 0.92081,-0.403165 0.92081,-0.920728 l 6.9e-4,-14.154116 c 0,-0.501097 -0.41966,-0.925235 -0.92081,-0.925235 l -21.07897,0 -7e-4,11.004713 c 0,0.480123 -0.52409,0.97706 -1.00422,0.97706 -0.48012,0 -0.99573,-0.496937 -0.99573,-0.97706 l 7e-4,-12.142797 c 0,-0.480124 0.40484,-0.862147 0.88497,-0.862147 l 4.59443,0 14.52051,5.2e-4 -7e-4,-2.95163 c 0,-0.56713 -0.42551,-1.04812 -0.99245,-1.04812 l -13.00724,0 0,-3.07907 c 0,-0.50118 -0.40586,-0.92081 -0.90701,-0.92081 z"
- id="path5073"
- sodipodi:nodetypes="ccccccccccsccccccccccc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
- <path
- style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
- sodipodi:nodetypes="ccccccccccsccccccccccc"
- id="rect3845-5"
- d="m -570.22204,-107.2957 c -0.50115,0 -0.92082,0.41966 -0.92082,0.92081 l 0,24.157884 c 0,0.51739 0.40324,0.920728 0.92082,0.920728 l 26.15768,0 c 0.51756,0 0.92081,-0.403165 0.92081,-0.920728 l 6.9e-4,-14.154116 c 0,-0.501097 -0.41966,-0.925235 -0.92081,-0.925235 l -21.07897,0 -7e-4,11.004713 c 0,0.480123 -0.52409,0.97706 -1.00422,0.97706 -0.48012,0 -0.99573,-0.496937 -0.99573,-0.97706 l 7e-4,-12.142797 c 0,-0.480124 0.40484,-0.862143 0.88497,-0.862143 l 4.59443,0 14.52051,5.2e-4 -7e-4,-2.951636 c 0,-0.56713 -0.42551,-1.04812 -0.99245,-1.04812 l -13.00724,0 0,-3.07907 c 0,-0.50118 -0.40586,-0.92081 -0.90701,-0.92081 z"
- inkscape:connector-curvature="0" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill-rule="evenodd" transform="translate(573.14 110.3)">
+ <path d="m-570.22-108.3c-0.50115 0-0.92082 0.41966-0.92082 0.92081v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86215 0.88497-0.86215h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z"/>
+ <path d="m-570.22-107.3c-0.50115 0-0.92082 0.41966-0.92082 0.92081v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86214 0.88497-0.86214h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg
index c04b00fedceb60f32caf2be906b47fb8111d1b95..676f10afe0b2b1046c63a745ebc2dc5b93565d40 100644
--- a/core/img/places/folder.svg
+++ b/core/img/places/folder.svg
@@ -1,1830 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="home.svg"
- inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/home.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="776"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="14.025105"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4566-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- id="linearGradient3587-6-5-26">
- <stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="18.967093"
- x2="-2.4040222"
- y1="4.4573336"
- x1="-2.4040222"
- gradientTransform="translate(13.927091,16.573387)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3475"
- xlink:href="#linearGradient3587-6-5-26"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- id="linearGradient4580-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-1"
- id="linearGradient4578-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2-1">
- <stop
- id="stop3589-9-2-8-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="1013.451"
- x2="209.34245"
- y1="998.45801"
- x1="209.34245"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3528"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- inkscape:collect="always" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <g
- transform="translate(-7.5117601e-7,40.000351)"
- id="g3499">
- <g
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:evenodd"
- id="g14154"
- transform="matrix(0.8666684,0,0,0.8666684,-172.0426,-903.42597)">
- <path
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
- sodipodi:nodetypes="ccccccccccsccccccccccc"
- id="rect3845"
- d="m 200.19539,998.56643 c -0.28913,0 -0.53125,0.24212 -0.53125,0.53125 l 0,13.93752 c 0,0.2985 0.23264,0.5312 0.53125,0.5312 l 15.09127,0 c 0.2986,0 0.53125,-0.2326 0.53125,-0.5312 l 4e-4,-8.166 c 0,-0.2891 -0.24212,-0.5338 -0.53125,-0.5338 l -12.16119,0 -4e-4,6.349 c 0,0.277 -0.30237,0.5637 -0.57937,0.5637 -0.277,0 -0.57447,-0.2867 -0.57447,-0.5637 l 4e-4,-7.0056 c 0,-0.277 0.23357,-0.4974 0.51057,-0.4974 l 2.65069,0 8.37738,3e-4 -4e-4,-1.7029 c 0,-0.3272 -0.24549,-0.6047 -0.57258,-0.6047 l -7.50433,0 0,-1.77642 c 0,-0.28915 -0.23415,-0.53125 -0.52328,-0.53125 z"
- inkscape:connector-curvature="0" />
- </g>
- <g
- style="opacity:0.7;fill:url(#linearGradient3528);fill-opacity:1;fill-rule:evenodd"
- id="g14154-0"
- transform="matrix(0.8666684,0,0,0.8666684,-172.0426,-904.42597)">
- <path
- style="fill:url(#linearGradient4578-7);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
- sodipodi:nodetypes="ccccccccccsccccccccccc"
- id="rect3845-5"
- d="m 200.19539,998.56643 c -0.28913,0 -0.53125,0.24212 -0.53125,0.53125 l 0,13.93752 c 0,0.2985 0.23264,0.5312 0.53125,0.5312 l 15.09127,0 c 0.2986,0 0.53125,-0.2326 0.53125,-0.5312 l 4e-4,-8.166 c 0,-0.2891 -0.24212,-0.5338 -0.53125,-0.5338 l -12.16119,0 -4e-4,6.349 c 0,0.277 -0.30237,0.5637 -0.57937,0.5637 -0.277,0 -0.57447,-0.2867 -0.57447,-0.5637 l 4e-4,-7.0056 c 0,-0.277 0.23357,-0.4974 0.51057,-0.4974 l 2.65069,0 8.37738,3e-4 -4e-4,-1.7029 c 0,-0.3272 -0.24549,-0.6047 -0.57258,-0.6047 l -7.50433,0 0,-1.77642 c 0,-0.28915 -0.23415,-0.53125 -0.52328,-0.53125 z"
- inkscape:connector-curvature="0" />
- </g>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" x2="209.34" y1="998.46" x1="209.34">
+ <stop offset="0"/>
+ <stop stop-color="#363636" offset="1"/>
+ </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g fill-rule="evenodd" transform="translate(-7.5118e-7 40)">
+ <g opacity=".6" transform="matrix(.86667 0 0 .86667 -172.04 -903.43)" fill="#fff">
+ <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd" fill="#fff"/>
</g>
+ <g opacity=".7" transform="matrix(.86667 0 0 .86667 -172.04 -904.43)" fill="url(#a)">
+ <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd" fill="url(#a)"/>
+ </g>
+ </g>
</svg>
diff --git a/core/img/places/home.png b/core/img/places/home.png
index 2945b84e868b2ef01de8c7751fed415ed1011daa..e664719e2ec960407908a497a4372e024f429062 100644
Binary files a/core/img/places/home.png and b/core/img/places/home.png differ
diff --git a/core/img/places/home.svg b/core/img/places/home.svg
index a836a5999f0d3e53137e6101fe4853d8693c0cb8..80b7dcc8663a7a52bafa4c9c69a077b4c1bc8257 100644
--- a/core/img/places/home.svg
+++ b/core/img/places/home.svg
@@ -1,1819 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="home.svg"
- inkscape:export-filename="home.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="773"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="16.000001"
- inkscape:cx="2.7409248"
- inkscape:cy="8.4568105"
- inkscape:window-x="0"
- inkscape:window-y="-1"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4085">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4087" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:0.7"
- id="stop4089" />
- </linearGradient>
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="28.776533"
- x2="0.44923753"
- y1="13.895414"
- x1="0.86849999"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3456"
- xlink:href="#linearGradient3587-6-5-4"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4566-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- id="linearGradient3587-6-5-26">
- <stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="18.967093"
- x2="-2.4040222"
- y1="4.4573336"
- x1="-2.4040222"
- gradientTransform="translate(13.927091,16.573387)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3475"
- xlink:href="#linearGradient3587-6-5-26"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4074"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.426613)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4085"
- id="linearGradient4083"
- x1="8"
- y1="1"
- x2="8"
- y2="15.458407"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4085"
- id="linearGradient4121"
- gradientUnits="userSpaceOnUse"
- x1="8"
- y1="1"
- x2="8"
- y2="15.458407"
- gradientTransform="translate(-20,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4085"
- id="linearGradient4436"
- x1="8"
- y1="1"
- x2="8"
- y2="15"
- gradientUnits="userSpaceOnUse" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- inkscape:connector-curvature="0"
- d="M 8,1.030589 0,9 l 3,0 0,6.0001 10,0 L 13,9 l 3,0 -3,-3.030592 0,-3.969524 -3,0 0,1.081169 -2,-2.050464 z"
- id="path3328"
- style="fill:url(#linearGradient4436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.7" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a" y2="15" gradientUnits="userSpaceOnUse" x2="8" y1="1" x1="8">
+ <stop offset="0"/>
+ <stop stop-color="#363636" stop-opacity=".7" offset="1"/>
+ </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path opacity=".7" d="m8 1.0306-8 7.9694h3v6.0001h10v-6h3l-3-3.0306v-3.9695h-3v1.0812l-2-2.0505z" fill-rule="evenodd" fill="url(#a)"/>
</svg>
diff --git a/core/img/places/music.svg b/core/img/places/music.svg
index e8f91f461664dfa933d121c37999e8baaa82bf23..f7eb391d981ace81600eaa8eca236fe22d3ddebc 100644
--- a/core/img/places/music.svg
+++ b/core/img/places/music.svg
@@ -1,73 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg4375"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="music.svg"
- inkscape:export-filename="music.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4377" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="7.9636746"
- inkscape:cy="12.572189"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4380">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(581.71429,-2.0764682)">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="path4291"
- d="m -554.98993,2.0786484 c -4.7142,0.75967 -11.02325,1.541691 -15.72435,2.343787 -1.24488,0.607384 -0.96502,2.171403 -1.02008,3.306244 0,5.0638836 0,10.1277666 0,15.1916436 -2.62346,-0.493215 -5.82272,1.674544 -5.96148,5.106844 -0.2265,2.136875 1.66842,3.996904 3.72898,4.04692 3.68932,0.08956 6.21256,-2.358151 6.25258,-5.453711 -0.0402,-5.198808 0.012,-10.399665 0,-15.599277 0.57116,-0.0423 9.22205,-1.6930062 9.99999,-1.8029142 0,3.8942932 0,7.7885872 0,11.6828792 -2.29278,-0.549271 -5.22379,0.957442 -5.95053,4.0345 -0.30674,1.72477 0.273,3.88966 2.0231,4.619966 3.41645,1.569871 8.10651,-1.610073 7.91585,-5.342127 -0.053,-6.932337 0.0434,-13.867516 0,-20.8005996 -0.0898,-0.651515 -0.53122,-1.381183 -1.26406,-1.334155 z"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- d="m -554.98993,3.0786486 c -4.7142,0.75967 -11.02325,1.541691 -15.72435,2.343787 -1.24488,0.607384 -0.96502,2.171403 -1.02008,3.306244 0,5.0638834 0,10.1277664 0,15.1916434 -2.62346,-0.493215 -5.82272,1.674544 -5.96148,5.106844 -0.2265,2.136875 1.66842,3.996904 3.72898,4.04692 3.68932,0.08956 6.21256,-2.358151 6.25258,-5.453711 -0.0402,-5.198808 0.012,-10.399665 0,-15.599277 0.57116,-0.0423 9.22205,-1.693006 9.99999,-1.802914 0,3.894293 0,7.788587 0,11.682879 -2.29278,-0.549271 -5.22379,0.957442 -5.95053,4.0345 -0.30674,1.72477 0.273,3.88966 2.0231,4.619966 3.41645,1.569871 8.10651,-1.610073 7.91585,-5.342127 -0.053,-6.932337 0.0434,-13.867516 0,-20.8005994 -0.0898,-0.651515 -0.53122,-1.381183 -1.26406,-1.334155 z"
- id="path4031-1"
- style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(581.71 -2.0765)">
+ <path d="m-554.99 2.0786c-4.7142 0.75967-11.023 1.5417-15.724 2.3438-1.2449 0.60738-0.96502 2.1714-1.0201 3.3062v15.192c-2.6235-0.49322-5.8227 1.6745-5.9615 5.1068-0.2265 2.1369 1.6684 3.9969 3.729 4.0469 3.6893 0.08956 6.2126-2.3582 6.2526-5.4537-0.0402-5.1988 0.012-10.4 0-15.599 0.57116-0.0423 9.222-1.693 10-1.8029v11.683c-2.2928-0.54927-5.2238 0.95744-5.9505 4.0345-0.30674 1.7248 0.273 3.8897 2.0231 4.62 3.4164 1.5699 8.1065-1.6101 7.9158-5.3421-0.053-6.9323 0.0434-13.868 0-20.801-0.0898-0.65152-0.53122-1.3812-1.2641-1.3342z"/>
+ <path d="m-554.99 3.0786c-4.7142 0.75967-11.023 1.5417-15.724 2.3438-1.2449 0.60738-0.96502 2.1714-1.0201 3.3062v15.192c-2.6235-0.49322-5.8227 1.6745-5.9615 5.1068-0.2265 2.1369 1.6684 3.9969 3.729 4.0469 3.6893 0.08956 6.2126-2.3582 6.2526-5.4537-0.0402-5.1988 0.012-10.4 0-15.599 0.57116-0.0423 9.222-1.693 10-1.8029v11.683c-2.2928-0.54927-5.2238 0.95744-5.9505 4.0345-0.30674 1.7248 0.273 3.8897 2.0231 4.62 3.4164 1.5699 8.1065-1.6101 7.9158-5.3421-0.053-6.9323 0.0434-13.868 0-20.801-0.0898-0.65152-0.53122-1.3812-1.2641-1.3342z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index a278240a6d6fd073b0b94ca43dc3356a84c4e77d..7b3af8c7f841c99e326bedcd9cf7764906a91c6e 100644
Binary files a/core/img/places/picture.png and b/core/img/places/picture.png differ
diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg
index aba68e620630b0f000a3d5913e4e4a2d4111cb02..791cbb5909af782233e6eb109bcf8193a415f8eb 100644
--- a/core/img/places/picture.svg
+++ b/core/img/places/picture.svg
@@ -1,75 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg4375"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="picture.svg"
- inkscape:export-filename="picture.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4377" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="13.989783"
- inkscape:cy="8.9886524"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4380">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(581.71429,-2.0764682)">
- <path
- sodipodi:nodetypes="cccccccccccccc"
- inkscape:connector-curvature="0"
- id="path3770"
- d="m -575.01366,3.0805705 c -0.39495,0.0765 -0.70712,0.466654 -0.70001,0.874878 l -6.2e-4,26.2461415 c 10e-6,0.458082 0.41045,0.874866 0.86155,0.874878 l 20.28048,0 c 0.4511,-1.2e-5 0.86154,-0.416796 0.86155,-0.874878 l 6.1e-4,-25.9212225 c -6.5e-4,-0.672871 -0.53099,-1.203711 -1.03374,-1.199797 0,0 -15.52067,0 -20.26982,0 z m 1.29978,19.9958975 18,0 8.2e-4,6 -18.00082,0 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992161999999996;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992161999999996;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m -575.01366,4.0805703 c -0.39495,0.0765 -0.70712,0.466654 -0.70001,0.874878 l -6.2e-4,26.2461417 c 10e-6,0.458082 0.41045,0.874866 0.86155,0.874878 l 20.28048,0 c 0.4511,-1.2e-5 0.86154,-0.416796 0.86155,-0.874878 l 6.1e-4,-25.9212227 c -6.5e-4,-0.672871 -0.53099,-1.203711 -1.03374,-1.199797 0,0 -15.52067,0 -20.26982,0 z m 1.29978,19.9958977 18,0 8.2e-4,6 -18.00082,0 z"
- id="path4160-9-9-8"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccccccc" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(581.71 -2.0765)">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-575.01 3.0806c-0.39495 0.0765-0.70712 0.46665-0.70001 0.87488l-0.00062 26.246c0.00001 0.45808 0.41045 0.87487 0.86155 0.87488h20.28c0.4511-0.000012 0.86154-0.4168 0.86155-0.87488l0.00061-25.921c-0.00065-0.67287-0.53099-1.2037-1.0337-1.1998h-20.27zm1.2998 19.996h18l0.00082 6h-18.001z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-575.01 4.0806c-0.39495 0.0765-0.70712 0.46665-0.70001 0.87488l-0.00062 26.246c0.00001 0.45808 0.41045 0.87487 0.86155 0.87488h20.28c0.4511-0.000012 0.86154-0.4168 0.86155-0.87488l0.00061-25.921c-0.00065-0.67287-0.53099-1.2037-1.0337-1.1998h-20.27zm1.2998 19.996h18l0.00082 6h-18.001z" fill="#fff"/>
+ </g>
</svg>
diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png
index 445d965ffeb2a64310790eb99829e92f22d48672..015f94837142b64ed34837e2e36922734de24769 100644
Binary files a/core/img/rating/s1.png and b/core/img/rating/s1.png differ
diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png
index b8d66c2a4c41085dae62d3c3408702a950cd86ed..b47b05e4f8983d5c160589bae38aa083a8ba5f0e 100644
Binary files a/core/img/rating/s10.png and b/core/img/rating/s10.png differ
diff --git a/core/img/rating/s11.png b/core/img/rating/s11.png
index aee9f9215608b2161c78f7091bb680dd7939096d..3dcb4bb4830a52f9767079fb4acc39d2cee43ef5 100644
Binary files a/core/img/rating/s11.png and b/core/img/rating/s11.png differ
diff --git a/core/img/rating/s2.png b/core/img/rating/s2.png
index 4f860e74ca12642e13c7fccea7268977e6f4d8e9..94ac5bc956648b35bee893bfa64bcb237dab79a2 100644
Binary files a/core/img/rating/s2.png and b/core/img/rating/s2.png differ
diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png
index 26c9baff55f066f80c1d73336c0302d1ee57a409..42a814ca081f5a6071fdf210b4a6095d1188d044 100644
Binary files a/core/img/rating/s3.png and b/core/img/rating/s3.png differ
diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png
index 47f1f694bf74df3a1664d8b5e3d3e9e3395b4656..5ce388875703076a48cbf08db65c0ee4546e29e4 100644
Binary files a/core/img/rating/s4.png and b/core/img/rating/s4.png differ
diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png
index aa225b6a9a9e2b12e4f9c5cf91fe0f0b29a20765..da4bbc584795ae60fe2c469ce217f0ad964da283 100644
Binary files a/core/img/rating/s5.png and b/core/img/rating/s5.png differ
diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png
index fd4f42e22c6c7e4f9ca8992df46ccfd48bd9a309..267c52ad3c03150291f8ed3ca498a82acafd951a 100644
Binary files a/core/img/rating/s6.png and b/core/img/rating/s6.png differ
diff --git a/core/img/rating/s7.png b/core/img/rating/s7.png
index 0d18a1dc025eca5097601a17f12e783c78a3bc94..3381d066d871291a5fcb47078173953d0242708e 100644
Binary files a/core/img/rating/s7.png and b/core/img/rating/s7.png differ
diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png
index 951c3fd3be43add49758497907ec9075314bdb1f..091dc5b21f07050da2c6447e930de48672381554 100644
Binary files a/core/img/rating/s8.png and b/core/img/rating/s8.png differ
diff --git a/core/img/rating/s9.png b/core/img/rating/s9.png
index b1a654c85d2a2bced5329366cc8c95b90dbd8620..dfe83563433e62e9169976187f265d5e7665cec8 100644
Binary files a/core/img/rating/s9.png and b/core/img/rating/s9.png differ
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
index f225423303130d4524e184c622efc42c8d8a3b7c..7e76e21209e539354805d12d8f92c5a8176c0861 100644
Binary files a/core/img/remoteStorage-big.png and b/core/img/remoteStorage-big.png differ
diff --git a/core/js/config.php b/core/js/config.php
index 48bea6ae5425d31b1127fb92c2d66956771d24a1..53a8fb96388601b1f8e57e387fbee1076892ae91 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,8 @@ $array = array(
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
"oc_webroot" => "\"".OC::$WEBROOT."\"",
"oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
- "oc_current_user" => "document.head.getAttribute('data-user')",
- "oc_requesttoken" => "document.head.getAttribute('data-requesttoken')",
+ "oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
+ "oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
"dayNames" => json_encode(
array(
@@ -62,4 +62,4 @@ $array = array(
// Echo it
foreach ($array as $setting => $value) {
echo("var ". $setting ."=".$value.";\n");
-}
\ No newline at end of file
+}
diff --git a/core/js/jquery-1.10.0.min.js b/core/js/jquery-1.10.0.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..01c688164ad8d7aec3d4fd75541e02a526d772eb
--- /dev/null
+++ b/core/js/jquery-1.10.0.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.0 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.0.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.0",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),r.attributes=ct(function(e){return e.innerHTML="<a href='#'></a>",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="<input>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;
+if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})
+}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(n.unit=o,n.start=+a||+r||0,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);a.finish=function(){t.stop(!0)},(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/core/js/jquery-1.7.2.min.js b/core/js/jquery-1.7.2.min.js
deleted file mode 100644
index 16ad06c5acaad09ee4d6e9d7c428506db028aeeb..0000000000000000000000000000000000000000
--- a/core/js/jquery-1.7.2.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.2 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
-a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
-.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/core/js/jquery-migrate-1.2.1.min.js b/core/js/jquery-migrate-1.2.1.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b7ec47a2d66397db47e3b4c14263f02b7221751
--- /dev/null
+++ b/core/js/jquery-migrate-1.2.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery Migrate v1.2.1 | (c) 2005, 2013 jQuery Foundation, Inc. and other contributors | jquery.org/license */
+jQuery.migrateMute===void 0&&(jQuery.migrateMute=!0),function(e,t,n){function r(n){var r=t.console;i[n]||(i[n]=!0,e.migrateWarnings.push(n),r&&r.warn&&!e.migrateMute&&(r.warn("JQMIGRATE: "+n),e.migrateTrace&&r.trace&&r.trace()))}function a(t,a,i,o){if(Object.defineProperty)try{return Object.defineProperty(t,a,{configurable:!0,enumerable:!0,get:function(){return r(o),i},set:function(e){r(o),i=e}}),n}catch(s){}e._definePropertyBroken=!0,t[a]=i}var i={};e.migrateWarnings=[],!e.migrateMute&&t.console&&t.console.log&&t.console.log("JQMIGRATE: Logging is active"),e.migrateTrace===n&&(e.migrateTrace=!0),e.migrateReset=function(){i={},e.migrateWarnings.length=0},"BackCompat"===document.compatMode&&r("jQuery is not compatible with Quirks Mode");var o=e("<input/>",{size:1}).attr("size")&&e.attrFn,s=e.attr,u=e.attrHooks.value&&e.attrHooks.value.get||function(){return null},c=e.attrHooks.value&&e.attrHooks.value.set||function(){return n},l=/^(?:input|button)$/i,d=/^[238]$/,p=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,f=/^(?:checked|selected)$/i;a(e,"attrFn",o||{},"jQuery.attrFn is deprecated"),e.attr=function(t,a,i,u){var c=a.toLowerCase(),g=t&&t.nodeType;return u&&(4>s.length&&r("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(g)&&(o?a in o:e.isFunction(e.fn[a])))?e(t)[a](i):("type"===a&&i!==n&&l.test(t.nodeName)&&t.parentNode&&r("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[c]&&p.test(c)&&(e.attrHooks[c]={get:function(t,r){var a,i=e.prop(t,r);return i===!0||"boolean"!=typeof i&&(a=t.getAttributeNode(r))&&a.nodeValue!==!1?r.toLowerCase():n},set:function(t,n,r){var a;return n===!1?e.removeAttr(t,r):(a=e.propFix[r]||r,a in t&&(t[a]=!0),t.setAttribute(r,r.toLowerCase())),r}},f.test(c)&&r("jQuery.fn.attr('"+c+"') may use property instead of attribute")),s.call(e,t,a,i))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?u.apply(this,arguments):("input"!==n&&"option"!==n&&r("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var a=(e.nodeName||"").toLowerCase();return"button"===a?c.apply(this,arguments):("input"!==a&&"option"!==a&&r("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t,n)}};var g,h,v=e.fn.init,m=e.parseJSON,y=/^([^<]*)(<[\w\W]+>)([^>]*)$/;e.fn.init=function(t,n,a){var i;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(i=y.exec(e.trim(t)))&&i[0]&&("<"!==t.charAt(0)&&r("$(html) HTML strings must start with '<' character"),i[3]&&r("$(html) HTML text after last tag is ignored"),"#"===i[0].charAt(0)&&(r("HTML string cannot start with a '#' character"),e.error("JQMIGRATE: Invalid selector string (XSS)")),n&&n.context&&(n=n.context),e.parseHTML)?v.call(this,e.parseHTML(i[2],n,!0),n,a):v.apply(this,arguments)},e.fn.init.prototype=e.fn,e.parseJSON=function(e){return e||null===e?m.apply(this,arguments):(r("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(g=e.uaMatch(navigator.userAgent),h={},g.browser&&(h[g.browser]=!0,h.version=g.version),h.chrome?h.webkit=!0:h.webkit&&(h.safari=!0),e.browser=h),a(e,"browser",e.browser,"jQuery.browser is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(r,a){return a&&a instanceof e&&!(a instanceof t)&&(a=t(a)),e.fn.init.call(this,r,a,n)},t.fn.init.prototype=t.fn;var n=t(document);return r("jQuery.sub() is deprecated"),t},e.ajaxSetup({converters:{"text json":e.parseJSON}});var b=e.fn.data;e.fn.data=function(t){var a,i,o=this[0];return!o||"events"!==t||1!==arguments.length||(a=e.data(o,t),i=e._data(o,t),a!==n&&a!==i||i===n)?b.apply(this,arguments):(r("Use of jQuery.fn.data('events') is deprecated"),i)};var j=/\/(java|ecma)script/i,w=e.fn.andSelf||e.fn.addBack;e.fn.andSelf=function(){return r("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)},e.clean||(e.clean=function(t,a,i,o){a=a||document,a=!a.nodeType&&a[0]||a,a=a.ownerDocument||a,r("jQuery.clean() is deprecated");var s,u,c,l,d=[];if(e.merge(d,e.buildFragment(t,a).childNodes),i)for(c=function(e){return!e.type||j.test(e.type)?o?o.push(e.parentNode?e.parentNode.removeChild(e):e):i.appendChild(e):n},s=0;null!=(u=d[s]);s++)e.nodeName(u,"script")&&c(u)||(i.appendChild(u),u.getElementsByTagName!==n&&(l=e.grep(e.merge([],u.getElementsByTagName("script")),c),d.splice.apply(d,[s+1,0].concat(l)),s+=l.length));return d});var Q=e.event.add,x=e.event.remove,k=e.event.trigger,N=e.fn.toggle,T=e.fn.live,M=e.fn.die,S="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",C=RegExp("\\b(?:"+S+")\\b"),H=/(?:^|\s)hover(\.\S+|)\b/,A=function(t){return"string"!=typeof t||e.event.special.hover?t:(H.test(t)&&r("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(H,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&a(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,a,i){e!==document&&C.test(t)&&r("AJAX events should be attached to document: "+t),Q.call(this,e,A(t||""),n,a,i)},e.event.remove=function(e,t,n,r,a){x.call(this,e,A(t)||"",n,r,a)},e.fn.error=function(){var e=Array.prototype.slice.call(arguments,0);return r("jQuery.fn.error() is deprecated"),e.splice(0,0,"error"),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this)},e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return N.apply(this,arguments);r("jQuery.fn.toggle(handler, handler...) is deprecated");var a=arguments,i=t.guid||e.guid++,o=0,s=function(n){var r=(e._data(this,"lastToggle"+t.guid)||0)%o;return e._data(this,"lastToggle"+t.guid,r+1),n.preventDefault(),a[r].apply(this,arguments)||!1};for(s.guid=i;a.length>o;)a[o++].guid=i;return this.click(s)},e.fn.live=function(t,n,a){return r("jQuery.fn.live() is deprecated"),T?T.apply(this,arguments):(e(this.context).on(t,this.selector,n,a),this)},e.fn.die=function(t,n){return r("jQuery.fn.die() is deprecated"),M?M.apply(this,arguments):(e(this.context).off(t,this.selector||"**",n),this)},e.event.trigger=function(e,t,n,a){return n||C.test(e)||r("Global events are undocumented and deprecated"),k.call(this,e,t,n||document,a)},e.each(S.split("|"),function(t,n){e.event.special[n]={setup:function(){var t=this;return t!==document&&(e.event.add(document,n+"."+e.guid,function(){e.event.trigger(n,null,t,!0)}),e._data(this,n,e.guid++)),!1},teardown:function(){return this!==document&&e.event.remove(document,n+"."+e._data(this,n)),!1}}})}(jQuery,window);
\ No newline at end of file
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..7413927e3b27064d4331cf041b84e837471cb22e
--- /dev/null
+++ b/core/js/jquery.ocdialog.js
@@ -0,0 +1,217 @@
+(function($) {
+ $.widget('oc.ocdialog', {
+ options: {
+ width: 'auto',
+ height: 'auto',
+ closeButton: true,
+ closeOnEscape: true,
+ modal: false
+ },
+ _create: function() {
+ var self = this;
+
+ this.originalCss = {
+ display: this.element[0].style.display,
+ width: this.element[0].style.width,
+ height: this.element[0].style.height,
+ };
+
+ this.originalTitle = this.element.attr('title');
+ this.options.title = this.options.title || this.originalTitle;
+
+ this.$dialog = $('<div class="oc-dialog" />')
+ .attr({
+ // Setting tabIndex makes the div focusable
+ tabIndex: -1,
+ role: 'dialog'
+ })
+ .insertBefore(this.element);
+ this.$dialog.append(this.element.detach());
+ this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog);
+
+ this.$dialog.css({
+ display: 'inline-block',
+ position: 'fixed'
+ });
+
+ $(document).on('keydown keyup', function(event) {
+ if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
+ return;
+ }
+ // Escape
+ if(event.keyCode === 27 && self.options.closeOnEscape) {
+ self.close();
+ return false;
+ }
+ // Enter
+ if(event.keyCode === 13) {
+ event.stopImmediatePropagation();
+ if(event.type === 'keyup') {
+ event.preventDefault();
+ return false;
+ }
+ // If no button is selected we trigger the primary
+ if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) {
+ var $button = self.$buttonrow.find('button.primary');
+ if($button) {
+ $button.trigger('click');
+ }
+ } else if(self.$buttonrow) {
+ $(event.target).trigger('click');
+ }
+ return false;
+ }
+ });
+ $(window).resize(function() {
+ self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
+ var pos = self.parent.position();
+ self.$dialog.css({
+ left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
+ top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+ });
+ });
+
+ this._setOptions(this.options);
+ $(window).trigger('resize');
+ this._createOverlay();
+ },
+ _init: function() {
+ this.$dialog.focus();
+ this._trigger('open');
+ },
+ _setOption: function(key, value) {
+ var self = this;
+ switch(key) {
+ case 'title':
+ var $title = $('<h3 class="oc-dialog-title">' + this.options.title
+ + '</h3>'); //<hr class="oc-dialog-separator" />');
+ if(this.$title) {
+ this.$title.replaceWith($title);
+ } else {
+ this.$title = $title.prependTo(this.$dialog);
+ }
+ this._setSizes();
+ break;
+ case 'buttons':
+ var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
+ if(this.$buttonrow) {
+ this.$buttonrow.replaceWith($buttonrow);
+ } else {
+ this.$buttonrow = $buttonrow.appendTo(this.$dialog);
+ }
+ $.each(value, function(idx, val) {
+ var $button = $('<button>').text(val.text);
+ if(val.defaultButton) {
+ $button.addClass('primary');
+ self.$defaultButton = $button;
+ }
+ self.$buttonrow.append($button);
+ $button.click(function() {
+ val.click.apply(self.element[0], arguments);
+ });
+ });
+ this.$buttonrow.find('button')
+ .on('focus', function(event) {
+ self.$buttonrow.find('button').removeClass('primary');
+ $(this).addClass('primary');
+ });
+ this._setSizes();
+ break;
+ case 'closeButton':
+ if(value) {
+ var $closeButton = $('<a class="oc-dialog-close svg"></a>');
+ this.$dialog.prepend($closeButton);
+ $closeButton.on('click', function() {
+ self.close();
+ });
+ }
+ break;
+ case 'width':
+ this.$dialog.css('width', value);
+ break;
+ case 'height':
+ this.$dialog.css('height', value);
+ break;
+ case 'close':
+ this.closeCB = value;
+ break;
+ }
+ //this._super(key, value);
+ $.Widget.prototype._setOption.apply(this, arguments );
+ },
+ _setOptions: function(options) {
+ //this._super(options);
+ $.Widget.prototype._setOptions.apply(this, arguments);
+ },
+ _setSizes: function() {
+ var content_height = this.$dialog.height();
+ if(this.$title) {
+ content_height -= this.$title.outerHeight(true);
+ }
+ if(this.$buttonrow) {
+ content_height -= this.$buttonrow.outerHeight(true);
+ }
+ this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
+ content_height = Math.min(content_height, this.parent.height()-20)
+ this.element.css({
+ height: content_height + 'px',
+ width: this.$dialog.innerWidth()-20 + 'px'
+ });
+ },
+ _createOverlay: function() {
+ if(!this.options.modal) {
+ return;
+ }
+
+ var self = this;
+ this.overlay = $('<div>')
+ .addClass('oc-dialog-dim')
+ .appendTo($('#content'));
+ this.overlay.on('click keydown keyup', function(event) {
+ if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
+ event.preventDefault();
+ event.stopPropagation();
+ return;
+ }
+ });
+ },
+ _destroyOverlay: function() {
+ if (!this.options.modal) {
+ return;
+ }
+
+ if (this.overlay) {
+ this.overlay.off('click keydown keyup');
+ this.overlay.remove();
+ this.overlay = null;
+ }
+ },
+ widget: function() {
+ return this.$dialog
+ },
+ close: function() {
+ this._destroyOverlay();
+ var self = this;
+ // Ugly hack to catch remaining keyup events.
+ setTimeout(function() {
+ self._trigger('close', self);
+ self.$dialog.hide();
+ }, 200);
+ },
+ destroy: function() {
+ if(this.$title) {
+ this.$title.remove()
+ }
+ if(this.$buttonrow) {
+ this.$buttonrow.remove()
+ }
+
+ if(this.originalTitle) {
+ this.element.attr('title', this.originalTitle);
+ }
+ this.element.removeClass('oc-dialog-content')
+ .css(this.originalCss).detach().insertBefore(this.$dialog);
+ this.$dialog.remove();
+ }
+ });
+}(jQuery));
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 990c3f8bf38b19cedb8bfed7785864174971e681..f4bc174b5ebdc5be5793eabb6b95cfa531600ecf 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -1,7 +1,7 @@
/**
* ownCloud
*
- * @author Bartek Przybylski
+ * @author Bartek Przybylski, Christopher Schäpers, Thomas Tanghus
* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +23,11 @@
* this class to ease the usage of jquery dialogs
*/
var OCdialogs = {
+ // dialog button types
+ YES_NO_BUTTONS: 70,
+ OK_BUTTONS: 71,
+ // used to name each dialog
+ dialogs_counter: 0,
/**
* displays alert dialog
* @param text content of dialog
@@ -31,8 +36,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
alert:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-alert"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays info dialog
@@ -42,8 +46,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
info:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-info"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ this.message(text, title, 'info', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays confirmation dialog
@@ -53,82 +56,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
confirm:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-notice"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal);
- },
- /**
- * prompt for user input
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses OK (input text will be passed to callback)
- * @param modal make the dialog modal
- */
- prompt:function(text, title, default_value, callback, modal) {
- var input = '<input type="text" id="oc-dialog-prompt-input" value="' + escapeHTML(default_value) + '" style="width:90%">';
- var content = '<p><span class="ui-icon ui-icon-pencil"></span>' + escapeHTML(text) + ':<br/>' + input + '</p>';
- OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
- },
- /**
- * prompt user for input with custom form
- * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'default value'},...]
- * example:
- * var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hello1',value:1},{text:'hello2',value:2}] }];
- * @param fields to display
- * @param title dialog title
- * @param callback which will be triggered when user presses OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
- * @param modal make the dialog modal
- */
- form:function(fields, title, callback, modal) {
- var content = '<table>';
- $.each(fields, function(index, field){
- content += '<tr><td>' + escapeHTML(field.text) + '</td><td>';
- var type = field.type;
-
- if (type === 'text' || type === 'checkbox' || type === 'password') {
- content += '<input type="' + type + '" name="' + field.name + '"';
- if (type === 'checkbox' && field.value === true) {
- content += ' checked="checked"';
- } else if (type === 'text' || type === 'password' && val.value) {
- content += ' value="' + escapeHTML(field.value) + '"';
- }
- content += '>';
- } else if (type === 'select') {
- content += '<select name="' + escapeHTML(field.name) + '"';
- if (field.value !== undefined) {
- content += ' value="' + escapeHTML(field.value) + '"';
- }
- content += '>';
- $.each(field.options, function(index, field_option){
- content += '<option value="' + escapeHTML(field_option.value) + '">' + escapeHTML(field_option.text) + '</option>';
- });
- content += '</select>';
- }
- content += '</td></tr>';
-
- });
- content += '</table>';
-
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
- if (modal === undefined) { modal = false };
- $('body').append(dialog_div);
- var buttonlist = [{
- text: t('core', 'Ok'),
- click: function(){ OCdialogs.form_ok_handler(callback, dialog_id); }
- },
- {
- text: t('core', 'Cancel'),
- click: function(){ $(dialog_id).dialog('close'); }
- }];
- var dialog_height = ( $('tr', dialog_div).length + 1 ) * 30 + 120;
- $(dialog_id).dialog({
- width: (4/9) * $(document).width(),
- height: dialog_height,
- modal: modal,
- buttons: buttonlist
- });
- OCdialogs.dialogs_counter++;
+ this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
},
/**
* show a file picker to pick a file from
@@ -139,288 +67,267 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
filepicker:function(title, callback, multiselect, mimetype_filter, modal) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_content = '<button id="dirup">↑</button><select id="dirtree"></select><div id="filelist"></div>';
- var dialog_loader = '<div class="filepicker_loader"><img src="' + OC.filePath('gallery','img','loading.gif') + '"></div>';
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + dialog_content + dialog_loader + '</div>';
- if (modal === undefined) { modal = false };
- if (multiselect === undefined) { multiselect = false };
- if (mimetype_filter === undefined) { mimetype_filter = '' };
+ var self = this;
+ $.when(this._getFilePickerTemplate()).then(function($tmpl) {
+ var dialog_name = 'oc-dialog-filepicker-content';
+ var dialog_id = '#' + dialog_name;
+ if(self.$filePicker) {
+ self.$filePicker.ocdialog('close');
+ }
+ self.$filePicker = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title
+ }).data('path', '');
- $('body').append(dialog_div);
+ if (modal === undefined) { modal = false };
+ if (multiselect === undefined) { multiselect = false };
+ if (mimetype_filter === undefined) { mimetype_filter = '' };
- $(dialog_id).data('path', '/');
+ $('body').append(self.$filePicker);
- $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
- $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
- $(dialog_id).ready(function(){
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) {
- OCdialogs.fillFilePicker(request, dialog_id);
- });
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: "httpd/unix-directory" }, function(request) {
- OCdialogs.fillTreeList(request, dialog_id);
- });
- }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+ self.$filePicker.ready(function() {
+ self.$filelist = self.$filePicker.find('.filelist');
+ self.$dirTree = self.$filePicker.find('.dirtree');
+ self.$dirTree.on('click', 'span:not(:last-child)', self, self._handleTreeListSelect);
+ self.$filelist.on('click', 'li', function(event) {
+ self._handlePickerClick(event, $(this));
+ });
+ self._fillFilePicker('');
+ }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
- // build buttons
- var functionToCall = function() {
- if (callback !== undefined) {
- var datapath;
- if (multiselect === true) {
- datapath = [];
- $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
- datapath.push( $(dialog_id).data('path') + $(element).text() );
- });
- } else {
- var datapath = $(dialog_id).data('path');
- datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+ // build buttons
+ var functionToCall = function() {
+ if (callback !== undefined) {
+ var datapath;
+ if (multiselect === true) {
+ datapath = [];
+ self.$filelist.find('.filepicker_element_selected .filename').each(function(index, element) {
+ datapath.push(self.$filePicker.data('path') + '/' + $(element).text());
+ });
+ } else {
+ var datapath = self.$filePicker.data('path');
+ datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text();
+ }
+ callback(datapath);
+ self.$filePicker.ocdialog('close');
}
- callback(datapath);
- $(dialog_id).dialog('close');
- }
- };
- var buttonlist = [{
- text: t('core', 'Choose'),
- click: functionToCall
- },
- {
- text: t('core', 'Cancel'),
- click: function(){$(dialog_id).dialog('close'); }
- }];
+ };
+ var buttonlist = [{
+ text: t('core', 'Choose'),
+ click: functionToCall,
+ defaultButton: true
+ },
+ {
+ text: t('core', 'Cancel'),
+ click: function(){self.$filePicker.ocdialog('close'); }
+ }];
- $(dialog_id).dialog({
- width: (4/9)*$(document).width(),
- height: 420,
- modal: modal,
- buttons: buttonlist
+ self.$filePicker.ocdialog({
+ closeOnEscape: true,
+ width: (4/9)*$(document).width(),
+ height: 420,
+ modal: modal,
+ buttons: buttonlist,
+ close: function(event, ui) {
+ try {
+ $(this).ocdialog('destroy').remove();
+ } catch(e) {}
+ self.$filePicker = null;
+ }
+ });
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file picker template'));
});
- OCdialogs.dialogs_counter++;
},
/**
* Displays raw dialog
* You better use a wrapper instead ...
*/
message:function(content, title, dialog_type, buttons, callback, modal) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
- if (modal === undefined) { modal = false };
- $('body').append(dialog_div);
- var buttonlist = [];
- switch (buttons) {
- case OCdialogs.YES_NO_BUTTONS:
- buttonlist = [{
- text: t('core', 'Yes'),
- click: function(){
- if (callback !== undefined) { callback(true) };
- $(dialog_id).dialog('close');
- }
- },
- {
- text: t('core', 'No'),
- click: function(){
- if (callback !== undefined) { callback(false) };
- $(dialog_id).dialog('close');
- }
- }];
- break;
- case OCdialogs.OK_BUTTON:
- var functionToCall;
- switch(dialog_type) {
- case OCdialogs.ALERT_DIALOG:
- functionToCall = function() {
- $(dialog_id).dialog('close');
- if(callback !== undefined) { callback() };
- };
- break;
- case OCdialogs.PROMPT_DIALOG:
- buttonlist[1] = {
- text: t('core', 'Cancel'),
- click: function() { $(dialog_id).dialog('close'); }
- };
- functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
- break;
- }
- buttonlist[0] = {
- text: t('core', 'Ok'),
- click: functionToCall
- };
- break;
- };
+ $.when(this._getMessageTemplate()).then(function($tmpl) {
+ var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+ var dialog_id = '#' + dialog_name;
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title,
+ message: content,
+ type: dialog_type
+ });
+ if (modal === undefined) { modal = false };
+ $('body').append($dlg);
+ var buttonlist = [];
+ switch (buttons) {
+ case OCdialogs.YES_NO_BUTTONS:
+ buttonlist = [{
+ text: t('core', 'Yes'),
+ click: function(){
+ if (callback !== undefined) { callback(true) };
+ $(dialog_id).ocdialog('close');
+ },
+ defaultButton: true
+ },
+ {
+ text: t('core', 'No'),
+ click: function(){
+ if (callback !== undefined) { callback(false) };
+ $(dialog_id).ocdialog('close');
+ }
+ }];
+ break;
+ case OCdialogs.OK_BUTTON:
+ var functionToCall = function() {
+ $(dialog_id).ocdialog('close');
+ if(callback !== undefined) { callback() };
+ };
+ buttonlist[0] = {
+ text: t('core', 'Ok'),
+ click: functionToCall,
+ defaultButton: true
+ };
+ break;
+ };
- $(dialog_id).dialog({
- width: (4/9) * $(document).width(),
- height: 180,
- modal: modal,
- buttons: buttonlist
+ $(dialog_id).ocdialog({
+ closeOnEscape: true,
+ modal: modal,
+ buttons: buttonlist
+ });
+ OCdialogs.dialogs_counter++;
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file picker template'));
});
- OCdialogs.dialogs_counter++;
},
- // dialog button types
- YES_NO_BUTTONS: 70,
- OK_BUTTONS: 71,
- // dialogs types
- ALERT_DIALOG: 80,
- INFO_DIALOG: 81,
- FORM_DIALOG: 82,
- // used to name each dialog
- dialogs_counter: 0,
-
- determineValue: function(element) {
- if ( $(element).attr('type') === 'checkbox' ) {
- return element.checked;
+ _getFilePickerTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$filePickerTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
+ self.$filePickerTemplate = $(tmpl);
+ self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
+ defer.resolve(self.$filePickerTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
} else {
- return $(element).val();
+ defer.resolve(this.$filePickerTemplate);
}
+ return defer.promise();
},
-
- prompt_ok_handler: function(callback, dialog_id) {
- $(dialog_id).dialog('close');
- if (callback !== undefined) { callback($(dialog_id + " input#oc-dialog-prompt-input").val()) };
- },
-
- form_ok_handler: function(callback, dialog_id) {
- if (callback !== undefined) {
- var valuelist = [];
- $(dialog_id + ' input, ' + dialog_id + ' select').each(function(index, element) {
- valuelist[index] = { name: $(element).attr('name'), value: OCdialogs.determineValue(element) };
+ _getMessageTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$messageTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+ self.$messageTemplate = $(tmpl);
+ defer.resolve(self.$messageTemplate);
+ })
+ .fail(function() {
+ defer.reject();
});
- $(dialog_id).dialog('close');
- callback(valuelist);
} else {
- $(dialog_id).dialog('close');
+ defer.resolve(this.$messageTemplate);
}
+ return defer.promise();
},
+ _getFileList: function(dir, mimeType) {
+ return $.getJSON(
+ OC.filePath('files', 'ajax', 'rawlist.php'),
+ {dir: dir, mimetype: mimeType}
+ );
+ },
+ _determineValue: function(element) {
+ if ( $(element).attr('type') === 'checkbox' ) {
+ return element.checked;
+ } else {
+ return $(element).val();
+ }
+ },
+
/**
* fills the filepicker with files
*/
- fillFilePicker:function(request, dialog_content_id) {
- var template_content = '<img src="*MIMETYPEICON*" style="margin: 2px 1em 0 4px;"><span class="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div>';
- var template = '<div data-entryname="*ENTRYNAME*" data-dcid="' + escapeHTML(dialog_content_id) + '" data="*ENTRYTYPE*">*CONTENT*</div>';
- var files = '';
+ _fillFilePicker:function(dir) {
var dirs = [];
var others = [];
- $.each(request.data, function(index, file) {
- if (file.type === 'dir') {
- dirs.push(file);
- } else {
- others.push(file);
- }
- });
- var sorted = dirs.concat(others);
- for (var i = 0; i < sorted.length; i++) {
- files_content = template_content.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon);
- files += template.replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)).replace('*CONTENT*', files_content);
- }
+ var self = this;
+ this.$filelist.empty().addClass('loading');
+ this.$filePicker.data('path', dir);
+ $.when(this._getFileList(dir, this.$filePicker.data('mimetype'))).then(function(response) {
+ $.each(response.data, function(index, file) {
+ if (file.type === 'dir') {
+ dirs.push(file);
+ } else {
+ others.push(file);
+ }
+ });
- $(dialog_content_id + ' #filelist').html(files);
- $('#filelist div').click(function() {
- OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
- });
+ self._fillSlug();
+ var sorted = dirs.concat(others);
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
- },
- /**
- * fills the tree list with directories
- */
- fillTreeList: function(request, dialog_id) {
- var template = '<option value="*COUNT*">*NAME*</option>';
- var paths = '<option value="0">' + escapeHTML($(dialog_id).data('path')) + '</option>';
- $.each(request.data, function(index, file) {
- paths += template.replace('*COUNT*', index).replace('*NAME*', escapeHTML(file.name));
- });
+ $.each(sorted, function(idx, entry) {
+ $li = self.$listTmpl.octemplate({
+ type: entry.type,
+ dir: dir,
+ filename: entry.name,
+ date: OC.mtime2date(entry.mtime)
+ });
+ $li.find('img').attr('src', entry.mimetype_icon);
+ self.$filelist.append($li);
+ });
- $(dialog_id + ' #dirtree').html(paths);
+ self.$filelist.removeClass('loading');
+ });
},
/**
- * handle selection made in the tree list
+ * fills the tree list with directories
*/
- handleTreeListSelect:function(event) {
- if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
- $(event.data.dcid).data('path', $("option:selected", this).html());
- } else {
- $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $("option:selected", this).html() + '/');
+ _fillSlug: function() {
+ this.$dirTree.empty();
+ var self = this
+ var path = this.$filePicker.data('path');
+ var $template = $('<span data-dir="{dir}">{name}</span>');
+ if(path) {
+ var paths = path.split('/');
+ $.each(paths, function(index, dir) {
+ var dir = paths.pop();
+ if(dir === '') {
+ return false;
+ }
+ self.$dirTree.prepend($template.octemplate({
+ dir: paths.join('/') + '/' + dir,
+ name: dir
+ }));
+ });
}
- $(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible');
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: $(event.data.dcid).data('mimetype')
- },
- function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
- },
- function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
- );
+ $template.octemplate({
+ dir: '',
+ name: ' ' // Ugly but works ;)
+ }, {escapeFunction: null}).addClass('home svg').prependTo(this.$dirTree);
},
/**
- * go one directory up
+ * handle selection made in the tree list
*/
- filepickerDirUp:function(event) {
- var old_path = $(event.data.dcid).data('path');
- if ( old_path !== "/") {
- var splitted_path = old_path.split("/");
- var new_path = ""
- for (var i = 0; i < splitted_path.length - 2; i++) {
- new_path += splitted_path[i] + "/"
- }
- $(event.data.dcid).data('path', new_path);
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: $(event.data.dcid).data('mimetype')
- },
- function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
- },
- function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
- );
- }
+ _handleTreeListSelect:function(event) {
+ var self = event.data;
+ var dir = $(event.target).data('dir');
+ self._fillFilePicker(dir);
},
/**
* handle clicks made in the filepicker
*/
- handlePickerClick:function(element, name, dialog_content_id) {
- if ( $(element).attr('data') === 'file' ){
- if ( $(dialog_content_id).data('multiselect') !== true) {
- $(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected');
+ _handlePickerClick:function(event, $element) {
+ if ($element.data('type') === 'file') {
+ if (this.$filePicker.data('multiselect') !== true || !event.ctrlKey) {
+ this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected');
}
- $(element).toggleClass('filepicker_element_selected');
+ $element.toggleClass('filepicker_element_selected');
return;
- } else if ( $(element).attr('data') === 'dir' ) {
- var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' );
- $(dialog_content_id).data('path', datapath);
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible');
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: datapath,
- mimetype: $(dialog_content_id).data('mimetype')
- },
- function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: datapath,
- mimetype: "httpd/unix-directory"
- },
- function(request) { OCdialogs.fillTreeList(request, dialog_content_id) }
- );
+ } else if ( $element.data('type') === 'dir' ) {
+ this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
}
}
};
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index e032506c0b1b3c93f5d3a116a868fe2d581d02bf..e69c6cc56e066fed3a03c3054fdfa040da2300c0 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -60,11 +60,11 @@
var self = this;
if(typeof this.options.escapeFunction === 'function') {
- $.each(this.vars, function(key, val) {
- if(typeof val === 'string') {
- self.vars[key] = self.options.escapeFunction(val);
+ for (var key = 0; key < this.vars.length; key++) {
+ if(typeof this.vars[key] === 'string') {
+ this.vars[key] = self.options.escapeFunction(this.vars[key]);
}
- });
+ }
}
var _html = this._build(this.vars);
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 587e59695caf2534ddefe40fd6f8ae3450f00f1e..8bd4429338a339d7e9f1ddfb6a5fe75a1169b574 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -44,11 +44,11 @@
"months ago" => "شهر مضى",
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Ok" => "موافق",
-"Cancel" => "الغاء",
"Choose" => "اختيار",
+"Cancel" => "الغاء",
"Yes" => "نعم",
"No" => "لا",
+"Ok" => "موافق",
"The object type is not specified." => "نوع العنصر غير محدد.",
"Error" => "خطأ",
"The app name is not specified." => "اسم التطبيق غير محدد.",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 74e28bf29001bc8fd4afa825d14525b2fbe8e6ea..6c04907e15b1b182140fd560f345f00f7c92f38d 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -28,10 +28,10 @@
"last month" => "последният месец",
"last year" => "последната година",
"years ago" => "последните години",
-"Ok" => "Добре",
"Cancel" => "Отказ",
"Yes" => "Да",
"No" => "Не",
+"Ok" => "Добре",
"Error" => "Грешка",
"Share" => "Споделяне",
"Share with" => "Споделено с",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 63a80edad383e7b041a749b444273af380943fd8..218bbce04aa2fff3900d8f754c5b6147826cd148 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -43,11 +43,11 @@
"months ago" => "মাস পূর্বে",
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
-"Ok" => "তথাস্তু",
-"Cancel" => "বাতির",
"Choose" => "বেছে নিন",
+"Cancel" => "বাতির",
"Yes" => "হ্যাঁ",
"No" => "না",
+"Ok" => "তথাস্তু",
"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
"Error" => "সমস্যা",
"The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index a1430d547f5a9afcc27a233f26893eec5510dff4..dad970d41794cddefb1eea32eba939abe6293952 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -44,11 +44,12 @@
"months ago" => "mesos enrere",
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Ok" => "D'acord",
-"Cancel" => "Cancel·la",
"Choose" => "Escull",
+"Cancel" => "Cancel·la",
+"Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
"Yes" => "Sí",
"No" => "No",
+"Ok" => "D'acord",
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
@@ -66,8 +67,8 @@
"Password" => "Contrasenya",
"Email link to person" => "Enllaç per correu electrónic amb la persona",
"Send" => "Envia",
-"Set expiration date" => "Estableix la data d'expiració",
-"Expiration date" => "Data d'expiració",
+"Set expiration date" => "Estableix la data de venciment",
+"Expiration date" => "Data de venciment",
"Share via email:" => "Comparteix per correu electrònic",
"No people found" => "No s'ha trobat ningú",
"Resharing is not allowed" => "No es permet compartir de nou",
@@ -80,8 +81,8 @@
"delete" => "elimina",
"share" => "comparteix",
"Password protected" => "Protegeix amb contrasenya",
-"Error unsetting expiration date" => "Error en eliminar la data d'expiració",
-"Error setting expiration date" => "Error en establir la data d'expiració",
+"Error unsetting expiration date" => "Error en eliminar la data de venciment",
+"Error setting expiration date" => "Error en establir la data de venciment",
"Sending ..." => "Enviant...",
"Email sent" => "El correu electrónic s'ha enviat",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index be354386e10c46ad55e520d73bf293678cb979d2..06cf7c214be0f0811a15e8f493496755b58c853c 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -44,11 +44,11 @@
"months ago" => "před měsíci",
"last year" => "minulý rok",
"years ago" => "před lety",
-"Ok" => "Ok",
-"Cancel" => "Zrušit",
"Choose" => "Vybrat",
+"Cancel" => "Zrušit",
"Yes" => "Ano",
"No" => "Ne",
+"Ok" => "Ok",
"The object type is not specified." => "Není určen typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Není určen název aplikace.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index a874d43965d05e5915e0d5c61abd097aae686cc0..cdb2576d4576a332f4bb01abb11eeda292eb8cb0 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -44,11 +44,11 @@
"months ago" => "misoedd yn ôl",
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
-"Ok" => "Iawn",
-"Cancel" => "Diddymu",
"Choose" => "Dewisiwch",
+"Cancel" => "Diddymu",
"Yes" => "Ie",
"No" => "Na",
+"Ok" => "Iawn",
"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
"Error" => "Gwall",
"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 43b2f4f840a16d603f2de155ba6d88a58aa45c62..4e9f742e80d0bd8a2947c1b05d7dcd6e41f0c5ed 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -44,11 +44,11 @@
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "år siden",
-"Ok" => "OK",
-"Cancel" => "Annuller",
"Choose" => "Vælg",
+"Cancel" => "Annuller",
"Yes" => "Ja",
"No" => "Nej",
+"Ok" => "OK",
"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
"The app name is not specified." => "Den app navn er ikke angivet.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index b53bda109ddaeeec9a47147572132e91440bdd8d..62e9925b945308eb6644232aa97e17854f995d15 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Ok" => "OK",
-"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
"Yes" => "Ja",
"No" => "Nein",
+"Ok" => "OK",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 7e9b64193c6f8809d62b10dc12cc1cc3d834ff96..ea8a4e5adc3d8e4b7405a1254c56820c8c1fe036 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -44,11 +44,12 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Ok" => "OK",
-"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
+"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
"Yes" => "Ja",
"No" => "Nein",
+"Ok" => "OK",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index dbe0d0ee3d65412a08366a4ed351ddafaf8c2177..11295105e311fcbbdd596de21c4d23c7cea9d3ee 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -44,11 +44,11 @@
"months ago" => "μήνες πριν",
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
-"Ok" => "Οκ",
-"Cancel" => "Άκυρο",
"Choose" => "Επιλέξτε",
+"Cancel" => "Άκυρο",
"Yes" => "Ναι",
"No" => "Όχι",
+"Ok" => "Οκ",
"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
"Error" => "Σφάλμα",
"The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 1889de1ea23ea8d38ea5e4479bde6aa304afa371..72cdf90c61e8d1bfaeb0a2b520581f1f7af91a07 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -43,11 +43,11 @@
"months ago" => "monatoj antaŭe",
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
-"Ok" => "Akcepti",
-"Cancel" => "Nuligi",
"Choose" => "Elekti",
+"Cancel" => "Nuligi",
"Yes" => "Jes",
"No" => "Ne",
+"Ok" => "Akcepti",
"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
"Error" => "Eraro",
"The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index d99ac861cea5fc0fef17f45eb05ca9e819695e75..4b8d5c7b18903d6d4640d9588c85d816ed4e4ac4 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -44,11 +44,12 @@
"months ago" => "hace meses",
"last year" => "el año pasado",
"years ago" => "hace años",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Seleccionar",
+"Cancel" => "Cancelar",
+"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
"Yes" => "Sí",
"No" => "No",
+"Ok" => "Aceptar",
"The object type is not specified." => "No se ha especificado el tipo de objeto",
"Error" => "Error",
"The app name is not specified." => "No se ha especificado el nombre de la aplicación.",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 8f77843708779a4ff1488b99587cf06d58a7097b..38b0791b94bdce60fa678d271a88c97ca88c136f 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Elegir",
+"Cancel" => "Cancelar",
"Yes" => "Sí",
"No" => "No",
+"Ok" => "Aceptar",
"The object type is not specified." => "El tipo de objeto no esta especificado. ",
"Error" => "Error",
"The app name is not specified." => "El nombre de la aplicación no esta especificado.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 79d3024f0145cc7ecf6ea807ebcf184d38369cdd..803b36e1c31fe33c21fac1677ac1f93d67d4defb 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,8 +1,8 @@
<?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Kasutaja %s jagas Sinuga faili",
+"User %s shared a file with you" => "Kasutaja %s jagas sinuga faili",
"User %s shared a folder with you" => "Kasutaja %s jagas Sinuga kausta.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas Sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas Sinuga kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas sinuga kausta \"%s\". See on allalaadimiseks saadaval siin: %s",
"Category type not provided." => "Kategooria tüüp puudub.",
"No category to add?" => "Pole kategooriat, mida lisada?",
"This category already exists: %s" => "See kategooria on juba olemas: %s",
@@ -10,7 +10,7 @@
"%s ID not provided." => "%s ID puudub.",
"Error adding %s to favorites." => "Viga %s lisamisel lemmikutesse.",
"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
-"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest",
+"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest.",
"Sunday" => "Pühapäev",
"Monday" => "Esmaspäev",
"Tuesday" => "Teisipäev",
@@ -44,14 +44,15 @@
"months ago" => "kuu tagasi",
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
-"Ok" => "Ok",
-"Cancel" => "Loobu",
"Choose" => "Vali",
+"Cancel" => "Loobu",
+"Error loading file picker template" => "Viga failivalija malli laadimisel",
"Yes" => "Jah",
"No" => "Ei",
+"Ok" => "Ok",
"The object type is not specified." => "Objekti tüüp pole määratletud.",
"Error" => "Viga",
-"The app name is not specified." => "Rakenduse nimi ole määratletud",
+"The app name is not specified." => "Rakenduse nimi ole määratletud.",
"The required file {file} is not installed!" => "Vajalikku faili {file} pole paigaldatud!",
"Shared" => "Jagatud",
"Share" => "Jaga",
@@ -82,13 +83,13 @@
"Password protected" => "Parooliga kaitstud",
"Error unsetting expiration date" => "Viga aegumise kuupäeva eemaldamisel",
"Error setting expiration date" => "Viga aegumise kuupäeva määramisel",
-"Sending ..." => "Saadan ...",
-"Email sent" => "Email saadetud",
+"Sending ..." => "Saatmine ...",
+"Email sent" => "E-kiri on saadetud",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
"ownCloud password reset" => "ownCloud parooli taastamine",
"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
"Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
"Username" => "Kasutajanimi",
@@ -112,7 +113,7 @@
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvalist juhuslike numbrite generaatorit pole saadaval. Palun luba PHP-s OpenSSL laiendus.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ilma turvalise juhuslike numbrite generaatorita võib ründaja ennustada paroolivahetuse võtme ning hõivata su konto.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.",
"Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
"Advanced" => "Täpsem",
"Data folder" => "Andmete kaust",
@@ -124,17 +125,17 @@
"Database tablespace" => "Andmebaasi tabeliruum",
"Database host" => "Andmebaasi host",
"Finish setup" => "Lõpeta seadistamine",
-"web services under your control" => "veebitenused sinu kontrolli all",
+"web services under your control" => "veebiteenused sinu kontrolli all",
"%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
"Log out" => "Logi välja",
"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
-"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!",
+"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!",
"Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
"Lost your password?" => "Kaotasid oma parooli?",
"remember" => "pea meeles",
"Log in" => "Logi sisse",
-"Alternative Logins" => "Alternatiivsed meldimised",
+"Alternative Logins" => "Alternatiivsed sisselogimisviisid",
"prev" => "eelm",
"next" => "järgm",
-"Updating ownCloud to version %s, this may take a while." => "Uuendan ownCloudi versioonile %s. Läheb pisut aega."
+"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 9c9d28133cf0a360fd329f36416ac2e04709bb38..1ec4ee8f5c4a8523aa89e9ed5b3c3cb45aa91cfa 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -44,11 +44,11 @@
"months ago" => "hilabete",
"last year" => "joan den urtean",
"years ago" => "urte",
-"Ok" => "Ados",
-"Cancel" => "Ezeztatu",
"Choose" => "Aukeratu",
+"Cancel" => "Ezeztatu",
"Yes" => "Bai",
"No" => "Ez",
+"Ok" => "Ados",
"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
"Error" => "Errorea",
"The app name is not specified." => "App izena ez dago zehaztuta.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ff73e80448332cf05764b7d8452f16f93df400ec..fb8a312587c99b12c562d0dbe358b646d1a6fccd 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -44,11 +44,11 @@
"months ago" => "ماههای قبل",
"last year" => "سال قبل",
"years ago" => "سالهای قبل",
-"Ok" => "قبول",
-"Cancel" => "منصرف شدن",
"Choose" => "انتخاب کردن",
+"Cancel" => "منصرف شدن",
"Yes" => "بله",
"No" => "نه",
+"Ok" => "قبول",
"The object type is not specified." => "نوع شی تعیین نشده است.",
"Error" => "خطا",
"The app name is not specified." => "نام برنامه تعیین نشده است.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3f50e814845fb00d8a3d5ef0dae24651ea1047b4..1f7a01e0e06950ebbc22fdfe1eeb79f66f450f64 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -42,11 +42,11 @@
"months ago" => "kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Ok" => "Ok",
-"Cancel" => "Peru",
"Choose" => "Valitse",
+"Cancel" => "Peru",
"Yes" => "Kyllä",
"No" => "Ei",
+"Ok" => "Ok",
"Error" => "Virhe",
"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
@@ -84,6 +84,7 @@
"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
"Username" => "Käyttäjätunnus",
"Request reset" => "Tilaus lähetetty",
@@ -118,6 +119,7 @@
"Database host" => "Tietokantapalvelin",
"Finish setup" => "Viimeistele asennus",
"web services under your control" => "verkkopalvelut hallinnassasi",
+"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
"Log out" => "Kirjaudu ulos",
"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 84ea35abcf20f3dbd84d3480181527ade6834acb..b01625a887b86102fb8be013944350b1a50151f6 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -44,11 +44,11 @@
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Ok" => "Ok",
-"Cancel" => "Annuler",
"Choose" => "Choisir",
+"Cancel" => "Annuler",
"Yes" => "Oui",
"No" => "Non",
+"Ok" => "Ok",
"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
"Error" => "Erreur",
"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 7269e79274460b996dc8c2d5d21b604154dd3778..986526954468b66caf8ed52aa4dd5f6555bc7925 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -44,11 +44,12 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Escoller",
+"Cancel" => "Cancelar",
+"Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
"Yes" => "Si",
"No" => "Non",
+"Ok" => "Aceptar",
"The object type is not specified." => "Non se especificou o tipo de obxecto.",
"Error" => "Erro",
"The app name is not specified." => "Non se especificou o nome do aplicativo.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 25603360741181054416632edf673dd9ecf323cb..eb2c3f3d1538979af80d18e97af9cff8942247c4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -44,11 +44,11 @@
"months ago" => "חודשים",
"last year" => "שנה שעברה",
"years ago" => "שנים",
-"Ok" => "בסדר",
-"Cancel" => "ביטול",
"Choose" => "בחירה",
+"Cancel" => "ביטול",
"Yes" => "כן",
"No" => "לא",
+"Ok" => "בסדר",
"The object type is not specified." => "סוג הפריט לא צוין.",
"Error" => "שגיאה",
"The app name is not specified." => "שם היישום לא צוין.",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index e79e71d4b2de985f28db76e120ececea0acf8d67..660b47c54fdbb0b9566a27e9c93cd617e2229e17 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -28,11 +28,11 @@
"months ago" => "mjeseci",
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Ok" => "U redu",
-"Cancel" => "Odustani",
"Choose" => "Izaberi",
+"Cancel" => "Odustani",
"Yes" => "Da",
"No" => "Ne",
+"Ok" => "U redu",
"Error" => "Greška",
"Share" => "Podijeli",
"Error while sharing" => "Greška prilikom djeljenja",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 4c44404fbc67c28faf2ce0d0a6cb84f378fe04d4..766e1bfc7eaff091e23667c32c61bc2b00123246 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -44,11 +44,12 @@
"months ago" => "több hónapja",
"last year" => "tavaly",
"years ago" => "több éve",
-"Ok" => "Ok",
-"Cancel" => "Mégsem",
"Choose" => "Válasszon",
+"Cancel" => "Mégsem",
+"Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
"Yes" => "Igen",
"No" => "Nem",
+"Ok" => "Ok",
"The object type is not specified." => "Az objektum típusa nincs megadva.",
"Error" => "Hiba",
"The app name is not specified." => "Az alkalmazás neve nincs megadva.",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 984822af1e36f7dec79d9f042a24af22d4aacbae..065a4f2e72771e452bcb0ecb3fbee51c5467e17c 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -44,11 +44,11 @@
"months ago" => "beberapa bulan lalu",
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
-"Ok" => "Oke",
-"Cancel" => "Batal",
"Choose" => "Pilih",
+"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
+"Ok" => "Oke",
"The object type is not specified." => "Tipe objek tidak ditentukan.",
"Error" => "Galat",
"The app name is not specified." => "Nama aplikasi tidak ditentukan.",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index d30d8bca11b518f61f19491c79c0e3525a050d77..bd8b58b29049eedc0dfe99563eb049e587ad068f 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -43,11 +43,11 @@
"months ago" => "mánuðir síðan",
"last year" => "síðasta ári",
"years ago" => "einhverjum árum",
-"Ok" => "Í lagi",
-"Cancel" => "Hætta við",
"Choose" => "Veldu",
+"Cancel" => "Hætta við",
"Yes" => "Já",
"No" => "Nei",
+"Ok" => "Í lagi",
"The object type is not specified." => "Tegund ekki tilgreind",
"Error" => "Villa",
"The app name is not specified." => "Nafn forrits ekki tilgreint",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 15fba6ec7d324d8bec9f637b673641fd5d8dcb1a..ce8f6411295657f8c4205ebf22b97800eea10a7d 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -44,11 +44,12 @@
"months ago" => "mesi fa",
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Ok" => "Ok",
-"Cancel" => "Annulla",
"Choose" => "Scegli",
+"Cancel" => "Annulla",
+"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
"Yes" => "Sì",
"No" => "No",
+"Ok" => "Ok",
"The object type is not specified." => "Il tipo di oggetto non è specificato.",
"Error" => "Errore",
"The app name is not specified." => "Il nome dell'applicazione non è specificato.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 783fe288ba3be9c69d5bbb28a9a157dc97b0ced4..8395a1d272eb810bfaf36ccd184c4e105fa9f5d9 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -44,11 +44,12 @@
"months ago" => "月前",
"last year" => "一年前",
"years ago" => "年前",
-"Ok" => "OK",
-"Cancel" => "キャンセル",
"Choose" => "選択",
+"Cancel" => "キャンセル",
+"Error loading file picker template" => "ファイルピッカーのテンプレートの読み込みエラー",
"Yes" => "はい",
"No" => "いいえ",
+"Ok" => "OK",
"The object type is not specified." => "オブジェクタイプが指定されていません。",
"Error" => "エラー",
"The app name is not specified." => "アプリ名がしていされていません。",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index fd2e512654fa6dc85e0e7230970f0863d876aabc..b474548eae84b5444a87cf37444c0e5b834723e4 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -44,11 +44,11 @@
"months ago" => "თვის წინ",
"last year" => "ბოლო წელს",
"years ago" => "წლის წინ",
-"Ok" => "დიახ",
-"Cancel" => "უარყოფა",
"Choose" => "არჩევა",
+"Cancel" => "უარყოფა",
"Yes" => "კი",
"No" => "არა",
+"Ok" => "დიახ",
"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
"Error" => "შეცდომა",
"The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 08713edaee1b310d411a7b5d018177442d8b8180..6b97d672cfd16243adf162611e210930e2fe1c4a 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -44,11 +44,11 @@
"months ago" => "개월 전",
"last year" => "작년",
"years ago" => "년 전",
-"Ok" => "승락",
-"Cancel" => "취소",
"Choose" => "선택",
+"Cancel" => "취소",
"Yes" => "예",
"No" => "아니요",
+"Ok" => "승락",
"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
"Error" => "오류",
"The app name is not specified." => "앱 이름이 지정되지 않았습니다.",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index f2277445f9cbc524d9baf886472ea48a5df2ab41..4c312df6618c974f3cbffe9ba995a434d5238c6b 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -28,11 +28,11 @@
"months ago" => "Méint hier",
"last year" => "Läscht Joer",
"years ago" => "Joren hier",
-"Ok" => "OK",
-"Cancel" => "Ofbriechen",
"Choose" => "Auswielen",
+"Cancel" => "Ofbriechen",
"Yes" => "Jo",
"No" => "Nee",
+"Ok" => "OK",
"Error" => "Fehler",
"Share" => "Deelen",
"Password" => "Passwuert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 85b76fe6948c4fbad7c6c63d71295fb030792625..1cd400117c8336afa625f31bf80b87ae6ef32ef7 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -33,11 +33,11 @@
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
-"Ok" => "Gerai",
-"Cancel" => "Atšaukti",
"Choose" => "Pasirinkite",
+"Cancel" => "Atšaukti",
"Yes" => "Taip",
"No" => "Ne",
+"Ok" => "Gerai",
"Error" => "Klaida",
"Share" => "Dalintis",
"Error while sharing" => "Klaida, dalijimosi metu",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 18af82e4e3637f0f8e54e7480fd11d0de1616367..e3d668d0183a2754b490d9a8a847c68105192d8d 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -44,11 +44,11 @@
"months ago" => "mēnešus atpakaļ",
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
-"Ok" => "Labi",
-"Cancel" => "Atcelt",
"Choose" => "Izvēlieties",
+"Cancel" => "Atcelt",
"Yes" => "Jā",
"No" => "Nē",
+"Ok" => "Labi",
"The object type is not specified." => "Nav norādīts objekta tips.",
"Error" => "Kļūda",
"The app name is not specified." => "Nav norādīts lietotnes nosaukums.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index a6c06e4780acd54a8c34e69ec8836b3960065357..b0c39debb8a042a2cad28af24a1102e9627ad562 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -43,11 +43,11 @@
"months ago" => "пред месеци",
"last year" => "минатата година",
"years ago" => "пред години",
-"Ok" => "Во ред",
-"Cancel" => "Откажи",
"Choose" => "Избери",
+"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Не",
+"Ok" => "Во ред",
"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
"The app name is not specified." => "Името на апликацијата не е специфицирано.",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 70581ff7693174f22f5040f6ee31b87f91d4684c..e7dc73a32c15fc7a545f5e1cb057537363d50781 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -21,10 +21,10 @@
"November" => "November",
"December" => "Disember",
"Settings" => "Tetapan",
-"Ok" => "Ok",
"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
+"Ok" => "Ok",
"Error" => "Ralat",
"Share" => "Kongsi",
"Password" => "Kata laluan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index ef8be954ede180a0a0a2d2097fbbb6d326e87fc7..6ea6a2c7bb52911c44f291c3b7b72002b1a06c7a 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -21,11 +21,11 @@
"last month" => "ပြီးခဲ့သောလ",
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Ok" => "အိုကေ",
-"Cancel" => "ပယ်ဖျက်မည်",
"Choose" => "ရွေးချယ်",
+"Cancel" => "ပယ်ဖျက်မည်",
"Yes" => "ဟုတ်",
"No" => "မဟုတ်ဘူး",
+"Ok" => "အိုကေ",
"Password" => "စကားဝှက်",
"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 6efb31a7def74c3d1cd6c5e8c6965a1957fe7d2f..30d3f91df2ac2e37421bf22ffdab07af6bd343bb 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -34,11 +34,11 @@
"months ago" => "måneder siden",
"last year" => "forrige år",
"years ago" => "år siden",
-"Ok" => "Ok",
-"Cancel" => "Avbryt",
"Choose" => "Velg",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
+"Ok" => "Ok",
"Error" => "Feil",
"Share" => "Del",
"Error while sharing" => "Feil under deling",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 7e823b2e61d7d4eb9edea56dccbb91bdb13cda25..0f30a2f49aa0d360d8cdfc009ae67acbda70bc6f 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -44,11 +44,12 @@
"months ago" => "maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Ok" => "Ok",
-"Cancel" => "Annuleer",
"Choose" => "Kies",
+"Cancel" => "Annuleer",
+"Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
"Yes" => "Ja",
"No" => "Nee",
+"Ok" => "Ok",
"The object type is not specified." => "Het object type is niet gespecificeerd.",
"Error" => "Fout",
"The app name is not specified." => "De app naam is niet gespecificeerd.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 2055be1b9a4e70c93adeb6a90e5fd4b5bdcf8060..de181ccc7ad791cb529555aa196d8a80dd02e19d 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -8,9 +8,9 @@
"This category already exists: %s" => "Denne kategorien finst alt: %s",
"Object type not provided." => "Ingen objekttype.",
"%s ID not provided." => "Ingen %s-ID.",
-"Error adding %s to favorites." => "Klarte ikkje å leggja til %s i favorittar.",
+"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
-"Error removing %s from favorites." => "Klarte ikkje å fjerna %s frå favorittar.",
+"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
"Sunday" => "Søndag",
"Monday" => "Måndag",
"Tuesday" => "Tysdag",
@@ -40,18 +40,18 @@
"yesterday" => "i går",
"{days} days ago" => "{days} dagar sidan",
"last month" => "førre månad",
-"{months} months ago" => "{months) månader sidan",
-"months ago" => "månader sidan",
+"{months} months ago" => "{months} månadar sidan",
+"months ago" => "månadar sidan",
"last year" => "i fjor",
"years ago" => "år sidan",
-"Ok" => "Greitt",
-"Cancel" => "Avbryt",
"Choose" => "Vel",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
+"Ok" => "Greitt",
"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
"Error" => "Feil",
-"The app name is not specified." => "App-namnet er ikkje spesifisert.",
+"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
"The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
"Shared" => "Delt",
"Share" => "Del",
@@ -66,8 +66,8 @@
"Password" => "Passord",
"Email link to person" => "Send lenkja over e-post",
"Send" => "Send",
-"Set expiration date" => "Set utlaupsdato",
-"Expiration date" => "Utlaupsdato",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
"Share via email:" => "Del over e-post:",
"No people found" => "Fann ingen personar",
"Resharing is not allowed" => "Vidaredeling er ikkje tillate",
@@ -80,8 +80,8 @@
"delete" => "slett",
"share" => "del",
"Password protected" => "Passordverna",
-"Error unsetting expiration date" => "Klarte ikkje å fjerna utlaupsdato",
-"Error setting expiration date" => "Klarte ikkje å setja utlaupsdato",
+"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
+"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
"Sending ..." => "Sender …",
"Email sent" => "E-post sendt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
@@ -99,7 +99,7 @@
"Reset password" => "Nullstill passord",
"Personal" => "Personleg",
"Users" => "Brukarar",
-"Apps" => "Applikasjonar",
+"Apps" => "Program",
"Admin" => "Admin",
"Help" => "Hjelp",
"Access forbidden" => "Tilgang forbudt",
@@ -116,8 +116,8 @@
"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"will be used" => "vil bli nytta",
+"Configure the database" => "Set opp databasen",
+"will be used" => "vil verta nytta",
"Database user" => "Databasebrukar",
"Database password" => "Databasepassord",
"Database name" => "Databasenamn",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index a384b0315bbc0d5aa2da653e9a0f7eca445ff18c..1d14428f183743d2f2ce37de06f3ac08153d9f53 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -29,11 +29,11 @@
"months ago" => "meses a",
"last year" => "an passat",
"years ago" => "ans a",
-"Ok" => "D'accòrdi",
-"Cancel" => "Annula",
"Choose" => "Causís",
+"Cancel" => "Annula",
"Yes" => "Òc",
"No" => "Non",
+"Ok" => "D'accòrdi",
"Error" => "Error",
"Share" => "Parteja",
"Error while sharing" => "Error al partejar",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 22cc24cd5148fabc612201b7247ec52a5344935c..045da821f2e0a6232aa46d74e79432cf162eeb50 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -44,11 +44,12 @@
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Ok" => "OK",
-"Cancel" => "Anuluj",
"Choose" => "Wybierz",
+"Cancel" => "Anuluj",
+"Error loading file picker template" => "Błąd podczas ładowania pliku wybranego szablonu",
"Yes" => "Tak",
"No" => "Nie",
+"Ok" => "OK",
"The object type is not specified." => "Nie określono typu obiektu.",
"Error" => "Błąd",
"The app name is not specified." => "Nie określono nazwy aplikacji.",
@@ -88,6 +89,8 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
"ownCloud password reset" => "restart hasła ownCloud",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
"You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
"Username" => "Nazwa użytkownika",
"Request reset" => "Żądanie resetowania",
@@ -123,6 +126,7 @@
"Database host" => "Komputer bazy danych",
"Finish setup" => "Zakończ konfigurowanie",
"web services under your control" => "Kontrolowane serwisy",
+"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
"Log out" => "Wyloguj",
"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
"If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index b52a9bb508aabe034ea308addf099cf08849f508..59c8f69aee719d93acd25c3da2f920b949213fa8 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -44,11 +44,12 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Ok" => "Ok",
-"Cancel" => "Cancelar",
"Choose" => "Escolha",
+"Cancel" => "Cancelar",
+"Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
"Yes" => "Sim",
"No" => "Não",
+"Ok" => "Ok",
"The object type is not specified." => "O tipo de objeto não foi especificado.",
"Error" => "Erro",
"The app name is not specified." => "O nome do app não foi especificado.",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 1084fc618f775d9f9e954b3ab3f3a6f39a80c4d5..f6de2db4fb6e184bdd0bbdb87460ecba64d2e17e 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -44,11 +44,12 @@
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Ok" => "Ok",
-"Cancel" => "Cancelar",
"Choose" => "Escolha",
+"Cancel" => "Cancelar",
+"Error loading file picker template" => "Erro ao carregar arquivo do separador modelo",
"Yes" => "Sim",
"No" => "Não",
+"Ok" => "Ok",
"The object type is not specified." => "O tipo de objecto não foi especificado",
"Error" => "Erro",
"The app name is not specified." => "O nome da aplicação não foi especificado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 36ee8ab4b6c45947480e4aec7ae282b375179f18..3d25a5f042bbec9e59d1f47e8d3ac37c152e2686 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -44,11 +44,11 @@
"months ago" => "luni în urmă",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Ok" => "Ok",
-"Cancel" => "Anulare",
"Choose" => "Alege",
+"Cancel" => "Anulare",
"Yes" => "Da",
"No" => "Nu",
+"Ok" => "Ok",
"The object type is not specified." => "Tipul obiectului nu a fost specificat",
"Error" => "Eroare",
"The app name is not specified." => "Numele aplicației nu a fost specificat",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 43dd398119d094df1020da1198a5de38e990f168..608b9271df5e7e889b903fa20bf5d3a8306d2812 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -44,11 +44,12 @@
"months ago" => "несколько месяцев назад",
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
-"Ok" => "Ок",
-"Cancel" => "Отменить",
"Choose" => "Выбрать",
+"Cancel" => "Отменить",
+"Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
"Yes" => "Да",
"No" => "Нет",
+"Ok" => "Ок",
"The object type is not specified." => "Тип объекта не указан",
"Error" => "Ошибка",
"The app name is not specified." => "Имя приложения не указано",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 8fb568aee7e274e415926675ddc7b4acdde660b0..580df5961f80b764fa4dd88d58add1a9aada8036 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,3 +1,7 @@
<?php $TRANSLATIONS = array(
-"Settings" => "Настройки"
+"Settings" => "Настройки",
+"Cancel" => "Отмена",
+"Error" => "Ошибка",
+"Share" => "Сделать общим",
+"Add" => "Добавить"
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index c1e8ba37ed9e5f412a7d4e0520f93c4faa9213fb..be7c1a24aad895bb0d9d7693a7ff80f17fca0ee2 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -28,11 +28,11 @@
"months ago" => "මාස කීපයකට පෙර",
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Ok" => "හරි",
-"Cancel" => "එපා",
"Choose" => "තෝරන්න",
+"Cancel" => "එපා",
"Yes" => "ඔව්",
"No" => "එපා",
+"Ok" => "හරි",
"Error" => "දෝෂයක්",
"Share" => "බෙදා හදා ගන්න",
"Share with" => "බෙදාගන්න",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 6a2d0aa5eced5dfe8bb6bae81f79fe80d62abb64..2dfaa01b5a1f9d2bfacd0ba374adf8ce5fde5425 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -44,11 +44,11 @@
"months ago" => "pred mesiacmi",
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Ok" => "Ok",
-"Cancel" => "Zrušiť",
"Choose" => "Výber",
+"Cancel" => "Zrušiť",
"Yes" => "Áno",
"No" => "Nie",
+"Ok" => "Ok",
"The object type is not specified." => "Nešpecifikovaný typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nešpecifikované meno aplikácie.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2854807130665f3862f5ea3731ae023481123846..a433aa2cc4ec8d1fcc810d8244d588c86c12b883 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -44,11 +44,11 @@
"months ago" => "mesecev nazaj",
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Ok" => "V redu",
-"Cancel" => "Prekliči",
"Choose" => "Izbor",
+"Cancel" => "Prekliči",
"Yes" => "Da",
"No" => "Ne",
+"Ok" => "V redu",
"The object type is not specified." => "Vrsta predmeta ni podana.",
"Error" => "Napaka",
"The app name is not specified." => "Ime programa ni podano.",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 8769a833e180cc07d066449d138f7769a07d26ca..40562add933e72af656cf1b96feb62fdc3ed94e1 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -44,11 +44,11 @@
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Ok" => "Në rregull",
-"Cancel" => "Anulo",
"Choose" => "Zgjidh",
+"Cancel" => "Anulo",
"Yes" => "Po",
"No" => "Jo",
+"Ok" => "Në rregull",
"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
"Error" => "Veprim i gabuar",
"The app name is not specified." => "Nuk është specifikuar emri i app-it.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 2329dc49b1723ef601a853bc8c767ee6a6bd3e11..49664f19f34b6324559b658e986e2eb2243c9db0 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -41,11 +41,11 @@
"months ago" => "месеци раније",
"last year" => "прошле године",
"years ago" => "година раније",
-"Ok" => "У реду",
-"Cancel" => "Откажи",
"Choose" => "Одабери",
+"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Не",
+"Ok" => "У реду",
"The object type is not specified." => "Врста објекта није подешена.",
"Error" => "Грешка",
"The app name is not specified." => "Име програма није унето.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 26bcebdf6c58f113eb9e25e74dc2e379c708bf26..d4154678b65c3a7286d59f1be73d13191d7a532e 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -44,11 +44,11 @@
"months ago" => "månader sedan",
"last year" => "förra året",
"years ago" => "år sedan",
-"Ok" => "Ok",
-"Cancel" => "Avbryt",
"Choose" => "Välj",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nej",
+"Ok" => "Ok",
"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
"The app name is not specified." => " Namnet på appen är inte specificerad.",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index b01f8df945ee22ee6357d8ddb4fb59feb02dec41..b67f5e967ece8c2a8da9be5d5c459dad0adbb2e2 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -39,11 +39,11 @@
"months ago" => "மாதங்களுக்கு முன்",
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
-"Ok" => "சரி",
-"Cancel" => "இரத்து செய்க",
"Choose" => "தெரிவுசெய்க ",
+"Cancel" => "இரத்து செய்க",
"Yes" => "ஆம்",
"No" => "இல்லை",
+"Ok" => "சரி",
"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
"Error" => "வழு",
"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 040ab9b550e81740deb2f06af26b5c4a7d94339e..1469d37296f33e76d3d4cec12ab148a34674946d 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -33,10 +33,10 @@
"months ago" => "నెలల క్రితం",
"last year" => "పోయిన సంవత్సరం",
"years ago" => "సంవత్సరాల క్రితం",
-"Ok" => "సరే",
"Cancel" => "రద్దుచేయి",
"Yes" => "అవును",
"No" => "కాదు",
+"Ok" => "సరే",
"Error" => "పొరపాటు",
"Password" => "సంకేతపదం",
"Send" => "పంపించు",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 1114726434c367ad2f16c39c885a4d2ae13a8f0e..66f5629b93309c2085c4eb680ec22ee865594500 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -43,11 +43,11 @@
"months ago" => "เดือน ที่ผ่านมา",
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
-"Ok" => "ตกลง",
-"Cancel" => "ยกเลิก",
"Choose" => "เลือก",
+"Cancel" => "ยกเลิก",
"Yes" => "ตกลง",
"No" => "ไม่ตกลง",
+"Ok" => "ตกลง",
"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
"Error" => "ข้อผิดพลาด",
"The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 29a6e7a286fcbc08b884e7a187d08b41df242a56..47574a012590f34a68a870aa308e5bfbdbc03240 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -44,11 +44,11 @@
"months ago" => "ay önce",
"last year" => "geçen yıl",
"years ago" => "yıl önce",
-"Ok" => "Tamam",
-"Cancel" => "İptal",
"Choose" => "seç",
+"Cancel" => "İptal",
"Yes" => "Evet",
"No" => "Hayır",
+"Ok" => "Tamam",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
"The app name is not specified." => "uygulama adı belirtilmedi.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 4727e37debdcdf93a49590166207ac1243cb3fd5..c1bf48e07dded9119c15e733ebc761836cc69f57 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -23,10 +23,10 @@
"1 hour ago" => "1 سائەت ئىلگىرى",
"today" => "بۈگۈن",
"yesterday" => "تۈنۈگۈن",
-"Ok" => "جەزملە",
"Cancel" => "ۋاز كەچ",
"Yes" => "ھەئە",
"No" => "ياق",
+"Ok" => "جەزملە",
"Error" => "خاتالىق",
"Share" => "ھەمبەھىر",
"Share with" => "ھەمبەھىر",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index a9e4117a61934753cfef45c0d1d0c4012e5d470e..65577297c3cc07a4ad7bddf9e799bbf55cd316e4 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -44,11 +44,11 @@
"months ago" => "місяці тому",
"last year" => "минулого року",
"years ago" => "роки тому",
-"Ok" => "Ok",
-"Cancel" => "Відмінити",
"Choose" => "Обрати",
+"Cancel" => "Відмінити",
"Yes" => "Так",
"No" => "Ні",
+"Ok" => "Ok",
"The object type is not specified." => "Не визначено тип об'єкту.",
"Error" => "Помилка",
"The app name is not specified." => "Не визначено ім'я програми.",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 544d041e48f6b272970d1c3f1281a696bacf2797..cf26212c25e05eccebffaa6f35b43969034b72ed 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -14,11 +14,11 @@
"November" => "نومبر",
"December" => "دسمبر",
"Settings" => "سیٹینگز",
-"Ok" => "اوکے",
-"Cancel" => "منسوخ کریں",
"Choose" => "منتخب کریں",
+"Cancel" => "منسوخ کریں",
"Yes" => "ہاں",
"No" => "نہیں",
+"Ok" => "اوکے",
"Error" => "ایرر",
"Error while sharing" => "شئیرنگ کے دوران ایرر",
"Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 31c4a37545c03eec652ec40d01e9aa5e2d7b3213..3e320ecf800dc2d37f61dde172d57623ded11a9d 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -44,11 +44,11 @@
"months ago" => "tháng trước",
"last year" => "năm trước",
"years ago" => "năm trước",
-"Ok" => "Đồng ý",
-"Cancel" => "Hủy",
"Choose" => "Chọn",
+"Cancel" => "Hủy",
"Yes" => "Có",
"No" => "Không",
+"Ok" => "Đồng ý",
"The object type is not specified." => "Loại đối tượng không được chỉ định.",
"Error" => "Lỗi",
"The app name is not specified." => "Tên ứng dụng không được chỉ định.",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 7e98d69b64207c53598318d96e72e3ca1cf9320c..2e0d0da6f2f9fedc6437fecb8419f83257ed4674 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -41,11 +41,11 @@
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
-"Ok" => "好的",
-"Cancel" => "取消",
"Choose" => "选择",
+"Cancel" => "取消",
"Yes" => "是",
"No" => "否",
+"Ok" => "好的",
"The object type is not specified." => "未指定对象类型。",
"Error" => "出错",
"The app name is not specified." => "未指定应用名称。",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index c37f7b2602b73419ab888211c77d1a0d9485ddb2..016a13625692ff3f4d0533e4e8747062553fe79b 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -44,11 +44,12 @@
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
-"Ok" => "好",
-"Cancel" => "取消",
"Choose" => "选择(&C)...",
+"Cancel" => "取消",
+"Error loading file picker template" => "加载文件选择器模板出错",
"Yes" => "是",
"No" => "否",
+"Ok" => "好",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定App名称。",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index c4f4009517794fd1e9c305d064ba577508b12e05..21418fe2eeb9bdf1742c05e3f77f86c8cf9a59df 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -23,10 +23,10 @@
"yesterday" => "昨日",
"last month" => "前一月",
"months ago" => "個月之前",
-"Ok" => "OK",
"Cancel" => "取消",
"Yes" => "Yes",
"No" => "No",
+"Ok" => "OK",
"Error" => "錯誤",
"Shared" => "已分享",
"Share" => "分享",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 6537e6dff075d1460c9d11a49baab7793296b9e7..10279c7ba182e4c87b1bdd94b08c62af5eb9a597 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -44,11 +44,12 @@
"months ago" => "幾個月前",
"last year" => "去年",
"years ago" => "幾年前",
-"Ok" => "好",
-"Cancel" => "取消",
"Choose" => "選擇",
+"Cancel" => "取消",
+"Error loading file picker template" => "載入檔案選擇器樣板發生錯誤",
"Yes" => "是",
"No" => "否",
+"Ok" => "好",
"The object type is not specified." => "未指定物件類型。",
"Error" => "錯誤",
"The app name is not specified." => "沒有指定 app 名稱。",
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
new file mode 100644
index 0000000000000000000000000000000000000000..e761fbdb567bb89623465c146a2bb786835f3eb0
--- /dev/null
+++ b/core/templates/filepicker.html
@@ -0,0 +1,10 @@
+<div id="{dialog_name}" title="{title}">
+ <span class="dirtree"></span>
+ <ul class="filelist">
+ <li data-entryname="{filename}" data-type="{type}">
+ <img />
+ <span class="filename">{filename}</span>
+ <span class="date">{date}</span>
+ </li>
+ </ul>
+</div>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 6e49149b0ae43491542c34336590bb989f92c3a2..a3ebf3abd0359418af1949b1f84f3c9b85bbc7a6 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -8,7 +8,8 @@
<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
<title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud
<?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
diff --git a/core/templates/message.html b/core/templates/message.html
new file mode 100644
index 0000000000000000000000000000000000000000..59048100f32031358ef32d6cc1c8e49e401ed64b
--- /dev/null
+++ b/core/templates/message.html
@@ -0,0 +1,3 @@
+<div id="{dialog_name}" title="{title}">
+ <p><span class="ui-icon ui-icon-{type}"></span>{message}</p>
+</div>
diff --git a/cron.php b/cron.php
index 7c875843c7545adc8e1463a111a74ad94c560929..95cedf8bf4c8852bf2f22c01b6474f9cb6267cb8 100644
--- a/cron.php
+++ b/cron.php
@@ -1,24 +1,24 @@
<?php
/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Jakob Sack
+ * @copyright 2012 Jakob Sack owncloud@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
// Unfortunately we need this class for shutdown function
class TemporaryCronClass {
@@ -30,29 +30,27 @@ class TemporaryCronClass {
// We use this function to handle (unexpected) shutdowns
function handleUnexpectedShutdown() {
// Delete lockfile
- if( !TemporaryCronClass::$keeplock && file_exists( TemporaryCronClass::$lockfile )) {
- unlink( TemporaryCronClass::$lockfile );
+ if (!TemporaryCronClass::$keeplock && file_exists(TemporaryCronClass::$lockfile)) {
+ unlink(TemporaryCronClass::$lockfile);
}
-
+
// Say goodbye if the app did not shutdown properly
- if( !TemporaryCronClass::$sent ) {
- if( OC::$CLI ) {
- echo 'Unexpected error!'.PHP_EOL;
- }
- else{
- OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+ if (!TemporaryCronClass::$sent) {
+ if (OC::$CLI) {
+ echo 'Unexpected error!' . PHP_EOL;
+ } else {
+ OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
}
}
}
-$RUNTIME_NOSETUPFS = true;
require_once 'lib/base.php';
session_write_close();
// Don't do anything if ownCloud has not been installed
-if( !OC_Config::getValue( 'installed', false )) {
- exit( 0 );
+if (!OC_Config::getValue('installed', false)) {
+ exit(0);
}
// Handle unexpected errors
@@ -63,50 +61,54 @@ OC_Helper::cleanTmpNoClean();
// Exit if background jobs are disabled!
$appmode = OC_BackgroundJob::getExecutionType();
-if( $appmode == 'none' ) {
+if ($appmode == 'none') {
TemporaryCronClass::$sent = true;
- if( OC::$CLI ) {
- echo 'Background Jobs are disabled!'.PHP_EOL;
+ if (OC::$CLI) {
+ echo 'Background Jobs are disabled!' . PHP_EOL;
+ } else {
+ OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
}
- else{
- OC_JSON::error( array( 'data' => array( 'message' => 'Background jobs disabled!')));
- }
- exit( 1 );
+ exit(1);
}
-if( OC::$CLI ) {
+if (OC::$CLI) {
// Create lock file first
- TemporaryCronClass::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
-
+ TemporaryCronClass::$lockfile = OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/cron.lock';
+
// We call ownCloud from the CLI (aka cron)
- if( $appmode != 'cron' ) {
+ if ($appmode != 'cron') {
// Use cron in feature!
- OC_BackgroundJob::setExecutionType('cron' );
+ OC_BackgroundJob::setExecutionType('cron');
}
// check if backgroundjobs is still running
- if( file_exists( TemporaryCronClass::$lockfile )) {
+ if (file_exists(TemporaryCronClass::$lockfile)) {
TemporaryCronClass::$keeplock = true;
TemporaryCronClass::$sent = true;
echo "Another instance of cron.php is still running!";
- exit( 1 );
+ exit(1);
}
// Create a lock file
- touch( TemporaryCronClass::$lockfile );
+ touch(TemporaryCronClass::$lockfile);
// Work
- OC_BackgroundJob_Worker::doAllSteps();
-}
-else{
+ $jobList = new \OC\BackgroundJob\JobList();
+ $jobs = $jobList->getAll();
+ foreach ($jobs as $job) {
+ $job->execute($jobList);
+ }
+} else {
// We call cron.php from some website
- if( $appmode == 'cron' ) {
+ if ($appmode == 'cron') {
// Cron is cron :-P
- OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
- }
- else{
+ OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
+ } else {
// Work and success :-)
- OC_BackgroundJob_Worker::doNextStep();
+ $jobList = new \OC\BackgroundJob\JobList();
+ $job = $jobList->getNext();
+ $job->execute($jobList);
+ $jobList->setLastJob($job);
OC_JSON::success();
}
}
diff --git a/db_structure.xml b/db_structure.xml
index dce90697b1c5952bd6ac546aabde6d08700fed47..933b09988f0b77b4cb25c6a5cc048a2e8b05a1e8 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -280,6 +280,14 @@
<length>4</length>
</field>
+ <field>
+ <name>storage_mtime</name>
+ <type>integer</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
<field>
<name>encrypted</name>
<type>integer</type>
@@ -288,6 +296,14 @@
<length>4</length>
</field>
+ <field>
+ <name>unencrypted_size</name>
+ <type>integer</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
<field>
<name>etag</name>
<type>text</type>
@@ -843,7 +859,7 @@
<table>
- <name>*dbprefix*queuedtasks</name>
+ <name>*dbprefix*jobs</name>
<declaration>
@@ -858,35 +874,35 @@
</field>
<field>
- <name>app</name>
+ <name>class</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
- <length>255</length>
+ <length>256</length>
</field>
<field>
- <name>klass</name>
+ <name>argument</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
- <length>255</length>
+ <length>256</length>
</field>
<field>
- <name>method</name>
- <type>text</type>
+ <name>last_run</name>
+ <type>integer</type>
<default></default>
- <notnull>true</notnull>
- <length>255</length>
+ <notnull>false</notnull>
</field>
- <field>
- <name>parameters</name>
- <type>text</type>
- <notnull>true</notnull>
- <length>255</length>
- </field>
+ <index>
+ <name>job_class_index</name>
+ <field>
+ <name>class</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
</declaration>
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 75c2b8c54c5eee80aea36e71a5da3955a521f7e1..fec8033bdc44727e1edaf0032aa902594e4c7b5f 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Maak opstelling klaar"
msgid "web services under your control"
msgstr "webdienste onder jou beheer"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Teken uit"
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index a1b17ff718f0f191975c193f3e034da95211c144..159278587dc0c76462a8aa7acb347498203adade 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 36aa676dfba57b519cb0842051fea78701ccc227..3ed16041c2edd66c99ad1c09285d9ce51aa3991d 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 661213122b635b4468547419ee96ed100a15d9c5..30a7d769223ce12c074b2816bc0b67744fd87df8 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 268f465228f8b0345380c7181277d8ac1f8cd5c6..934d01cdeb964bf4de770e3487498a2ca323a4ed 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index b98068957e76a74a04b7f2c9b34cd44bcd2e12b0..59b6ea0942ba2798b3d9aee9163d51e33a2f6382 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index d21eec3f1e4441a3956054659adafd8daf973d2e..a663f48e1751178506b8c9d837661e7a0a0f07c0 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index cd9b771d4709b5b5122587a336ac01acb0d993c9..ae775042a064487da6f2d91704305004304ec799 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hulp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persoonlik"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Instellings"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Gebruikers"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Toepassings"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 641b7e82fc2b57477452d6c0d15d2e3bd8e28e1b..868778c6d74865626b94207bdeb4d3e4b373f97b 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Wagwoord"
@@ -423,7 +423,7 @@ msgstr "Nuwe wagwoord"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 21d7bba975243fb82a7fc90836f5c99bd0460d59..71d8cea474a0e5de65cc918209db4610f81acfdb 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Wagwoord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hulp"
diff --git a/l10n/af_ZA/user_webdavauth.po b/l10n/af_ZA/user_webdavauth.po
index bb29159478ce7b7443eef28281d59c000a71ec69..62bfbe01b3489a9901061bd6f44f09e8ea5a8eb0 100644
--- a/l10n/af_ZA/user_webdavauth.po
+++ b/l10n/af_ZA/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 9442b987a22fe742d220689c45bb183fdb96f6fa..495ca68005fc9f4d5c29d6cfd2de9fec70b22edd 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "السنةالماضية"
msgid "years ago"
msgstr "سنة مضت"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "موافق"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "اختيار"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "الغاء"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "اختيار"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "لا"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "موافق"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "انهاء التعديلات"
msgid "web services under your control"
msgstr "خدمات الشبكة تحت سيطرتك"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "الخروج"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 4e209e0c8e5892688b8c04b4ad29aa1972401613..a52047896fb48b59bf0a53466aac8f3e7566d373 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index cde78c5cd1ba3ea5b1c14a8551d34a118aa83236..bcccd33c2f8d5b21b547bdf635ccda3d6bb84900 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "جاري الحفظ..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "التشفير"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "تشفير الملفات فعال."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "الملفات الاتية لن يتم تشفيرها:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "إستثناء أنواع الملفات الاتية من التشفير: "
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "لا شيء"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 6ba8fd6540ce3ae55bf921773bf98f19c4afd3cd..dc64cac0bb5910126edb6092d45e32768b35933b 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 58288103c145534aa5440df134cb2e8804ae8f49..58015e50318cec1999dc0f8c3cd244fcc77a5e1e 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 7687fcb5553341b2df4a8d2a581e89cfb42cc421..50981cac8bd7a817afedf786c0f60633fb2ad72e 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "تعذّر حذف%s بشكل دائم"
msgid "Couldn't restore %s"
msgstr "تعذّر استرجاع %s "
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "إبدء عملية الإستعادة"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "خطأ"
@@ -39,31 +39,31 @@ msgstr "خطأ"
msgid "delete file permanently"
msgstr "حذف بشكل دائم"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "حذف بشكل دائم"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "اسم"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "تم الحذف"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "مجلد عدد 1"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} مجلدات"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "ملف واحد"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ملفات"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 58b505fc60e8905c2dc4be06b879ecda89e98a3a..9066fe25fafa54cb1db92342cdfe4f8905b8f84e 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index c05edd40e02001af34414ac348539b02a22686c3..368f6ff254a8e6d43ba32e5c0b8090921fd638cd 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "المساعدة"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "شخصي"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "إعدادات"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "المستخدمين"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "التطبيقات"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "المدير"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "تحميل ملفات ZIP متوقف"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "العودة الى الملفات"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "تعذّر تحديده"
@@ -113,72 +113,76 @@ msgstr "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعد
msgid "%s set the database host."
msgstr "%s ادخل اسم خادم قاعدة البيانات"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "اسم المستخدم و/أو كلمة المرور لنظام Oracle غير صحيح"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "اسم المستخدم و/أو كلمة المرور لنظام MySQL غير صحيح"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "خطأ في قواعد البيانات : \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "الأمر المخالف كان : \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "أسم المستخدم '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "احذف اسم المستخدم هذا من الـ MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "أسم المستخدم '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "احذف اسم المستخدم هذا من الـ MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "اسم المستخدم و/أو كلمة المرور لنظام Oracle غير صحيح"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "اسم المستخدم و/أو كلمة المرور لنظام MS SQL غير صحيح : %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 4f9b7f9cb416be259d704e225f1bc53e92b923fa..90cafbceddef8f13aa4e774902a92d15c85c0415 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "تم التحديث بنجاح"
msgid "Saving..."
msgstr "جاري الحفظ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "تم الحذف"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "تراجع"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "تعذر حذف المستخدم"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "مجموعات"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "إلغاء"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "اضافة مجموعة"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "يجب ادخال اسم مستخدم صحيح"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "حصل خطأ اثناء انشاء مستخدم"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صحيحة"
@@ -324,11 +324,11 @@ msgstr "المزيد"
msgid "Less"
msgstr "أقل"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "احصل على التطبيقات لمزامنة ملفاتك"
msgid "Show First Run Wizard again"
msgstr "ابدأ خطوات بداية التشغيل من جديد"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "كلمة المرور"
@@ -423,39 +423,39 @@ msgstr "كلمات سر جديدة"
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "اسم الحساب"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "البريد الإلكترونى"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "عنوانك البريدي"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "اللغة"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "ساعد في الترجمه"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "اسم الدخول"
@@ -463,30 +463,34 @@ msgstr "اسم الدخول"
msgid "Create"
msgstr "انشئ"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "وحدة التخزين الافتراضية"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "غير محدود"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "شيء آخر"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "وحدة التخزين"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "تغيير اسم الحساب"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "اعداد كلمة مرور جديدة"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "افتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index ede2881fa3a229783f6e824108dd18f39f3382cd..725f5ca966b0256b7995feea6d35029d09fa45b7 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "خطأ"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "كلمة المرور"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "المساعدة"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 7defa1d4b06c9eb4e5a7015e5bb45b6dc8f484c4..0b90ad151d9abf0c539f9823bb6406410388df33 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <hussein-atef@hotmail.com>, 2012.
-# <shiningmoon25@gmail.com>, 2012.
-# <tarek.taha@gmail.com>, 2013.
+# TYMAH <hussein-atef@hotmail.com>, 2012
+# aboodilankaboot, 2012
+# blackcoder <tarek.taha@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index b35189b41aeac7c6009100e89583a18b5382e8ed..5a28e4f3e46ce96c6068f2f84258717738fc6742 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/be/files.po b/l10n/be/files.po
index de9d057f6ad8ca2e0351137561f271797b5ca6c3..ac51487cf2343b528d7c9a1ede8d17ca25cc18e5 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index e69ef2d14dc0cb9ab78c358e33ba5e4c3ce08034..c0d6dac572734db49621847364b48ce13035d64b 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index 142d2eff37ff768bf4001e63dd8f7c71c632b3a2..c6f284fc40b2455bcfed4446d72b21a8d3560377 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index 03a80d8b42d804bcfdf0adf143fe5d7e905fc15a..b09ac51eb4d5ff5be8d7efed33cdb95afb3b0f03 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 1953d1cd3db311ecd50f845e4946d377e5ebee6c..41c6a308ab9e306dad13db706d6c883d3350859d 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_versions.po b/l10n/be/files_versions.po
index e194db5f43375e0603810062ca7dfe915321f9a6..2ec579f88f7bf46a6c6b63a40c05d4b7924756e8 100644
--- a/l10n/be/files_versions.po
+++ b/l10n/be/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 284f8eeb6a7bba1678fcf13ec754009c4acee3ed..7fe412203cfb19325b84a3e31e9ebf1461921db1 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 9da698983180b35b7e5d911b7e2455ad0ef2b07b..77d13b3886cdab4bdb687eb6473ec2ad1c8ddae5 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index b6630ab6f2fdbf22c269dd6f095946b5881ee403..9f896e71d17f88e2d9913c67c8f6496e9196b2fc 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/be/user_webdavauth.po b/l10n/be/user_webdavauth.po
index 9e0304b10bc8e81f89232ee3c7986573be82eff3..21fb9c8c465f18c49afc00d9d75be30dd9a25d62 100644
--- a/l10n/be/user_webdavauth.po
+++ b/l10n/be/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index eb678223979a198cfc6a63da551b48b91a12200c..4db3754c97f85ccc83fe085b4465c662b7ca2583 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "последната година"
msgid "years ago"
msgstr "последните години"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Добре"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Отказ"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Не"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Добре"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Завършване на настройките"
msgid "web services under your control"
msgstr "уеб услуги под Ваш контрол"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Изход"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 0d49d30e76d0d30154d3db643293662cd2777b03..4febe1372485d7d6b61f2ec979782da4030aced3 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 859b65c0eb2b2ed2144c481250615af06cad59f6..9bc2e0ee7a6ff8071d76a62b326d241e80e88138 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Записване..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Криптиране"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Няма"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 8c95fe66a347271938ac2ddd6a795305661e0e35..005f4be9ca7b2608dfa194f070838909ba5241fb 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 156d054e77bc5263a426481c467636fc8c00f167..ea49f21419f1661c0b58f382b2345248708778dc 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index a2db650ea73dbc19f1f2eabbcd11f8603abab08e..e391b181a0693d300054824a763c768fbc49df53 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Невъзможно изтриване на %s завинаги"
msgid "Couldn't restore %s"
msgstr "Невъзможно възтановяване на %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "извършване на действие по възстановяване"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Грешка"
@@ -39,31 +39,31 @@ msgstr "Грешка"
msgid "delete file permanently"
msgstr "изтриване на файла завинаги"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Изтриване завинаги"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Изтрито"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} папки"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} файла"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index d01c393db1e25f107508a7d9f012bebee1297951..1d86aa6d8d3b10a63b55f9516fc5babdac85959c 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 5ba599532f7be8a0d083034d9dcc87e53449539a..e2c560a53fb982a08731dcc758eed19646521c7f 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помощ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Лични"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Настройки"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Потребители"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Приложения"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Админ"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Изтеглянето като ZIP е изключено."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Файловете трябва да се изтеглят един по един."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Назад към файловете"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "не може да се определи"
@@ -113,72 +113,76 @@ msgstr "%s, не можете да ползвате точки в името н
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Невалидно PostgreSQL потребителско име и/или парола"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Невалидно Oracle потребителско име и/или парола"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Невалидно MySQL потребителско име и/или парола"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Грешка в базата от данни: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL потребителят '%s'@'localhost' вече съществува"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Изтриване на потребителя от MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL потребителят '%s'@'%%' вече съществува."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Изтриване на потребителя от MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Невалидно Oracle потребителско име и/или парола"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e6571146d9bbdff2bb855de08878734d4c0e31af..f02923ceabc09f8f017fa52ecc8f31fc21da2d8c 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Обновено"
msgid "Saving..."
msgstr "Записване..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "изтрито"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "възтановяване"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Изтриване"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "нова група"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Още"
msgid "Less"
msgstr "По-малко"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "Покажи настройките за първоначално зареждане отново"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Парола"
@@ -423,39 +423,39 @@ msgstr "Нова парола"
msgid "Change password"
msgstr "Промяна на паролата"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Екранно име"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Вашия email адрес"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Въведете е-поща за възстановяване на паролата"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Език"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Помогнете с превода"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Потребител"
@@ -463,30 +463,34 @@ msgstr "Потребител"
msgid "Create"
msgstr "Създаване"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Хранилище по подразбиране"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Неограничено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Други"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 0c18cd66039a039798c69714bb9672129645511f..af255ba0488a9d9276653639425526733e23a1ce 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Парола"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помощ"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 2d321a7650492e476586ca23d6625cb71259122b..fb9b137fdff7ba10148fcff38482b527380eb6ec 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-23 09:40+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 59b3c25b06d9bbb90416086d77a40945ed24231e..cbe7b2ab1e2246126c83baa7301c8b0146c1e56d 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "গত বছর"
msgid "years ago"
msgstr "বছর পূর্বে"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "তথাস্তু"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "বেছে নিন"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "বাতির"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "বেছে নিন"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "হ্যাঁ"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "না"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "তথাস্তু"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "সেটআপ সুসম্পন্ন কর"
msgid "web services under your control"
msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "প্রস্থান"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index ff66538e585dc67e3684a1709e789744687db41c..2b55e51fc89ca1af222d5dfdb5b99071550f1b11 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index a2ee8c0db4d8b645d7cb84b1deb7c5868b921341..3b9c0439d515a0c84af43d52a7b08fab2aa03d65 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "সংরক্ষণ করা হচ্ছে.."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "কোনটিই নয়"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 910f1b7be0442908f205ed9c59becc7289fbf621..cfb952a4853baf763d33ebcd639ff0bdb4fa22dd 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 32181f41e112b3fdcdb6f48af2da79f2aad3ce7c..982c0e344354782414d77e95a76b727c562b84d8 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index effbaf5571385ac078b4c0ce6fc53a88447cd0e1..322ba4bd5ffeb65c6ee00f6ac97fe421f09347e4 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "সমস্যা"
@@ -39,31 +39,31 @@ msgstr "সমস্যা"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "রাম"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "১টি ফোল্ডার"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} টি ফোল্ডার"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "১টি ফাইল"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} টি ফাইল"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 2edd5f1a35a71e337a4fcfead8c60db01469f4b8..7bc652b6c84833aab793db37f66fddb5a1987208 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 6ba334e04d2adb3afe1d712a209a2c99845a2e00..43fe032b8ffed014fb02260cb0f6c28bfa43fe2e 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "সহায়িকা"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ব্যক্তিগত"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ব্যবহারকারী"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "অ্যাপ"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "প্রশাসন"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "ফাইলে ফিরে চল"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 3a1219324736708ac8bef814cf811e4a0be4816a..b07fc191521d993aa69b063a3f86bbe597d8206c 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "ক্রিয়া প্রত্যাহার"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "গোষ্ঠীসমূহ"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "গোষ্ঠী প্রশাসক"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "মুছে"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "বেশী"
msgid "Less"
msgstr "কম"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "ভার্সন"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "কূটশব্দ"
@@ -423,39 +423,39 @@ msgstr "নতুন কূটশব্দ"
msgid "Change password"
msgstr "কূটশব্দ পরিবর্তন করুন"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "ইমেইল"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "আপনার ই-মেইল ঠিকানা"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "ভাষা"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "অনুবাদ করতে সহায়তা করুন"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "তৈরী কর"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "পূর্বনির্ধারিত সংরক্ষণাগার"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "অসীম"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "অন্যান্য"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "সংরক্ষণাগার"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "পূর্বনির্ধারিত"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 782011bb13e7dd847d0abca51c811d69022baa07..1613ef51b97919b33b039781dd2b196e7e8c64a9 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "সমস্যা"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "হোস্ট"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL আবশ্যক না হলে আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "ভিত্তি DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "ব্যবহারকারি DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "কূটশব্দ"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ব্যবহারকারির প্রবেশ ছাঁকনী"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "প্রবেশের চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid দিয়ে প্রতিস্থাপিত হবে।"
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ব্যবহারকারী তালিকা ছাঁকনী"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "গোষ্ঠী ছাঁকনী"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।"
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "পোর্ট"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS ব্যবহার কর"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "বর্ণ অসংবেদী LDAP সার্ভার (উইন্ডোজ)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "শুধুমাত্র যদি এই বিকল্পটি ব্যবহার করেই সংযোগ কার্যকরী হয় তবে আপনার ownCloud সার্ভারে LDAP সার্ভারের SSL সনদপত্রটি আমদানি করুন।"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ব্যবহারকারীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "গোষ্ঠীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "বাইটে"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "সহায়িকা"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index e5c329e580b76d124bcc1e24e841e7192d959e8b..1768f6474f044b017003815604eeffd9bc32bcfe 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
+# Shubhra Paul <paul_shubhra@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 5eacd2f6a022bf1f7d896af008305d1cfb61a185..4ac35149cdec7184c67604dc52442b1f3a88ba08 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 21:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -213,26 +214,30 @@ msgstr "l'any passat"
msgid "years ago"
msgstr "anys enrere"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "D'acord"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escull"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancel·la"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escull"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Error en carregar la plantilla del seleccionador de fitxers"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "D'acord"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -308,11 +313,11 @@ msgstr "Envia"
#: js/share.js:178
msgid "Set expiration date"
-msgstr "Estableix la data d'expiració"
+msgstr "Estableix la data de venciment"
#: js/share.js:179
msgid "Expiration date"
-msgstr "Data d'expiració"
+msgstr "Data de venciment"
#: js/share.js:211
msgid "Share via email:"
@@ -364,11 +369,11 @@ msgstr "Protegeix amb contrasenya"
#: js/share.js:577
msgid "Error unsetting expiration date"
-msgstr "Error en eliminar la data d'expiració"
+msgstr "Error en eliminar la data de venciment"
#: js/share.js:589
msgid "Error setting expiration date"
-msgstr "Error en establir la data d'expiració"
+msgstr "Error en establir la data de venciment"
#: js/share.js:604
msgid "Sending ..."
@@ -561,12 +566,12 @@ msgstr "Acaba la configuració"
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Surt"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index b131f8debdea55fa5302e41626dec5f8de41033d..436ee3aec70488bccd42565df5c6a5f61237086f 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} fitxers"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
#: lib/app.php:73
msgid "Unable to rename file"
@@ -261,7 +262,7 @@ msgstr "Desa"
#: templates/index.php:7
msgid "New"
-msgstr "Nova"
+msgstr "Nou"
#: templates/index.php:10
msgid "Text file"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 98fd3185f0b3070ad598e3f1371ccd8e82d8c085..10fc22da5c65d5599056d6e8c0f91a22f4097b8b 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 10:40+0000\n"
-"Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,87 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Desant..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Xifrat"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "El xifrat de fitxers està activat."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Els tipus de fitxers següents no es xifraran:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Exclou els tipus de fitxers següents del xifratge:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Cap"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index ae9bf2ab8ae5c8c8f21a1974eb28140a84d197d6..db9e5dfb76020c37682f7939674aed3cd0c9b652 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 21:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index d23fa033638ad60e80726010fdf65544a44037b2..4ba839ce6a2250a6a94bcfb454c66204be5253ec 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index b91a1a13b376497b00115db45e760b5a6bce2e4c..ce490a2e470dfff3ea853ba4d189e3e2750e72bd 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "No s'ha pogut esborrar permanentment %s"
msgid "Couldn't restore %s"
msgstr "No s'ha pogut restaurar %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "executa l'operació de restauració"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Error"
@@ -39,31 +39,31 @@ msgstr "Error"
msgid "delete file permanently"
msgstr "esborra el fitxer permanentment"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Esborra permanentment"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Eliminat"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 carpeta"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} carpetes"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fitxer"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} fitxers"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 624a5da1e1d292c5dc59e44d8d9def28e34dc50c..c1e4d1db8d646f91c09239b8435899f5c3f613bf 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 9225ebad500f385318796428e94026add05367a0..faff0c767bf54d6d8ee26fa65b1dcd8fdce641c2 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configuració"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuaris"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicacions"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administració"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "La baixada en ZIP està desactivada."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Els fitxers s'han de baixar d'un en un."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Torna a Fitxers"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "no s'ha pogut determinar"
@@ -113,72 +114,76 @@ msgstr "%s no podeu usar punts en el nom de la base de dades"
msgid "%s set the database host."
msgstr "%s establiu l'ordinador central de la base de dades."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Heu d'escriure un compte existent o el d'administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "No s'ha pogut establir la connexió Oracle"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya MySQL no vàlids"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "L'ordre en conflicte és: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Elimina aquest usuari de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Elimina aquest usuari de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index d2c9ab2cd895b07af2ece995dcf24d97f73a4c52..032f43b74c722a7e7c0823c1db3a8fea667cb0f8 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 21:40+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +126,44 @@ msgstr "Actualitzada"
msgid "Saving..."
msgstr "Desant..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "esborrat"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "desfés"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grups"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Esborra"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "afegeix grup"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Heu de facilitar un nom d'usuari vàlid"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Error en crear l'usuari"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya vàlida"
@@ -325,11 +326,11 @@ msgstr "Més"
msgid "Less"
msgstr "Menys"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versió"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "Obtén les aplicacions per sincronitzar fitxers"
msgid "Show First Run Wizard again"
msgstr "Torna a mostrar l'assistent de primera execució"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contrasenya"
@@ -424,39 +425,39 @@ msgstr "Contrasenya nova"
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nom a mostrar"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Correu electrònic"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Correu electrònic"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nom d'accés"
@@ -464,30 +465,34 @@ msgstr "Nom d'accés"
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperació de contrasenya d'administrador"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Emmagatzemament per defecte"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Il·limitat"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Un altre"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Emmagatzemament"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "canvia el nom a mostrar"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "estableix nova contrasenya"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 91d2f5617cb5362bb075d7a5cec548a5e514d93a..cb56954f9f0d6dc3cbc77b7f489d72de663333ea 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Ha fallat en eliminar els mapatges"
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Ha fallat en eliminar la configuració del servidor"
@@ -53,281 +58,363 @@ msgstr "Voleu mantenir la configuració?"
msgid "Cannot add server configuration"
msgstr "No es pot afegir la configuració del servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "s'han eliminat els mapatges"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Èxit"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "La prova de connexió ha reeixit"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "La prova de connexió ha fallat"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Voleu eliminar la configuració actual del servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirma l'eliminació"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuració del servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Afegeix la configuració del servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Equip remot"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Una DN Base per línia"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Usuari"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contrasenya"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtre d'inici de sessió d'usuari"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Llista de filtres d'usuari"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtre de grup"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defineix el filtre a aplicar quan es mostren grups."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Arranjaments de connexió"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuració activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Si està desmarcat, aquesta configuració s'ometrà."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Màquina de còpia de serguretat (rèplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Port de la còpia de seguretat (rèplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desactiva el servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Quan està connectat, ownCloud només es connecta al servidor de la rèplica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desactiva la validació de certificat SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "No recomanat, ús només per proves."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Memòria de cau Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segons. Un canvi buidarà la memòria de cau."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Arranjaments de carpetes"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Camp per mostrar el nom d'usuari"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Arbre base d'usuaris"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Una DN Base d'Usuari per línia"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributs de cerca d'usuari"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; Un atribut per línia"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Camp per mostrar el nom del grup"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Arbre base de grups"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Una DN Base de Grup per línia"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributs de cerca de grup"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associació membres-grup"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributs especials"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Camp de quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota per defecte"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Camp de correu electrònic"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Norma per anomenar la carpeta arrel d'usuari"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nom d'usuari intern"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atribut nom d'usuari intern:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Sobrescriu la detecció UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atribut UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Comprovació de la configuració"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index bcde4299fd412857b476dfc90bbd06072997040a..66136ea54afafc078361f1b4b567285892403b28 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <rcalvoi@yahoo.com>, 2012-2013.
+# rogerc, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 275c6f62f9e8759ff8e0b0e00b1ad1fa6c811f5d..19d8824d33f4a9912c59bbe8e8ec85e5a3589a79 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 06:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "před lety"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vybrat"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Zrušit"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vybrat"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Dokončit nastavení"
msgid "web services under your control"
msgstr "služby webu pod Vaší kontrolou"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Odhlásit se"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 38b1eebdac3325030d02bdaf7c477eba0f553461..1212b63feb12a19ee24f36fdba060af89dcf3a6a 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index af7d094cfbfcbcac9c27737d1ce8bf8f5a01ae6e..6c2fa91ab96e4054cee70e3f48fb9194dbe6b335 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Ukládám..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Šifrování"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifrování je povoleno."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Následující typy souborů nebudou šifrovány:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Vyjmout následující typy souborů ze šifrování:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Žádné"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 62dc51cbd58dd90784e3c262d4f063a93c120b4a..993ed7edf8e0be98b4ddaab5668921566351db8f 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index b26c3b61d684b609c980d0abdb7b4417c39459d3..1f16d54c480bec97cc1ded57bbb1bdbaa1626e7a 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index be29385223121fca7348510c9bfd72d21b03508f..c4dd41f482cc386dcaf1f2240b3e901271729762 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Nelze trvale odstranit %s"
msgid "Couldn't restore %s"
msgstr "Nelze obnovit %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "provést obnovu"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Chyba"
@@ -39,31 +39,31 @@ msgstr "Chyba"
msgid "delete file permanently"
msgstr "trvale odstranit soubor"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Trvale odstranit"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Název"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Smazáno"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 složka"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} složky"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 soubor"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} soubory"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 03e51b990abead3fad91e187ea547f6ee8ca7b38..11930a8b793d8417ce25bed12750ed3efa6bdf51 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index ae5d9d8705556b2c3426fd4061ec7c6171de5475..7c0d67efd91b9011cdddc8704d03078742f2391b 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Nápověda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobní"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nastavení"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Uživatelé"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikace"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrace"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Stahování ZIPu je vypnuto."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Soubory musí být stahovány jednotlivě."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Zpět k souborům"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nelze zjistit"
@@ -113,72 +113,76 @@ msgstr "V názvu databáze %s nesmíte používat tečky."
msgid "%s set the database host."
msgstr "Zadejte název počítače s databází %s."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Uživatelské jméno, či heslo PostgreSQL není platné"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Musíte zadat existující účet, či správce."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Uživatelské jméno, či heslo Oracle není platné"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Uživatelské jméno, či heslo MySQL není platné"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Chyba DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Podezřelý příkaz byl: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Zahodit uživatele z MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Zahodit uživatele z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Uživatelské jméno, či heslo Oracle není platné"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Uživatelské jméno, či heslo MSSQL není platné: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index d0c227483ecf1a4d8b90d4de36e23a70ae0004ae..d0e6d27677637a41b37d3f005eeae4a08d586cf9 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Aktualizováno"
msgid "Saving..."
msgstr "Ukládám..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "smazáno"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "zpět"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Smazat"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "přidat skupinu"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Musíte zadat platné uživatelské jméno"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Chyba při vytváření užiatele"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Musíte zadat platné heslo"
@@ -324,11 +324,11 @@ msgstr "Více"
msgid "Less"
msgstr "Méně"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Získat aplikace pro synchronizaci vašich souborů"
msgid "Show First Run Wizard again"
msgstr "Znovu zobrazit průvodce prvním spuštěním"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Heslo"
@@ -423,39 +423,39 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Zobrazované jméno"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Vaše e-mailová adresa"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Přihlašovací jméno"
@@ -463,30 +463,34 @@ msgstr "Přihlašovací jméno"
msgid "Create"
msgstr "Vytvořit"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Výchozí úložiště"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Neomezeně"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Jiný"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Úložiště"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "změnit zobrazované jméno"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "nastavit nové heslo"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Výchozí"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index ef1a936b3d155ace23d0fcedcdd3d2a7eb4f6ae6..9591f0e61112e46ada0f6acf107cb1ca80f8b4d0 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Selhalo smazání nastavení serveru"
@@ -53,281 +57,363 @@ msgstr "Ponechat nastavení?"
msgid "Cannot add server configuration"
msgstr "Nelze přidat nastavení serveru"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Úspěch"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Chyba"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test spojení byl úspěšný"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Test spojení selhal"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Opravdu si přejete smazat současné nastavení serveru?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potvrdit smazání"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Nastavení serveru"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Přidat nastavení serveru"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Počítač"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Základní DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Jedna základní DN na řádku"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Uživatelské DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtr přihlášení uživatelů"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtr uživatelských seznamů"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Určuje použitý filtr, pro získávaní uživatelů."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znaků, např. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtr skupin"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Určuje použitý filtr, pro získávaní skupin."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Nastavení spojení"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Nastavení aktivní"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Pokud není zaškrtnuto, bude nastavení přeskočeno."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Záložní (kopie) hostitel"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Záložní (kopie) port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Zakázat hlavní serveru"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Při zapnutí se ownCloud připojí pouze k záložnímu serveru"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Použít TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Nepoužívejte pro spojení LDAP, selže."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišující velikost znaků (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Vypnout ověřování SSL certifikátu."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Není doporučeno, pouze pro testovací účely."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "TTL vyrovnávací paměti"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Nastavení adresáře"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Pole pro zobrazované jméno uživatele"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Základní uživatelský strom"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Jedna uživatelská základní DN na řádku"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributy vyhledávání uživatelů"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Volitelné, atribut na řádku"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Pole pro zobrazení jména skupiny"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Základní skupinový strom"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Jedna skupinová základní DN na řádku"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributy vyhledávání skupin"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociace člena skupiny"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Speciální atributy"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Pole pro kvótu"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Výchozí kvóta"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "v bajtech"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Pole e-mailu"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pojmenování domovské složky uživatele"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Vyzkoušet nastavení"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Nápověda"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index a7466ca6bf10e8f3fa66a7aefd4f2aa32eb02704..420758436b0489b07961ab1da1aa04aa0714c8a9 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 2d3c304cc330330740d2b734674bf1bd0c99de64..e8b891b6f5ffacc1cce182a995b96ecedeb19ad6 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "y llynedd"
msgid "years ago"
msgstr "blwyddyn yn ôl"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Iawn"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Dewisiwch"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Diddymu"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Dewisiwch"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Na"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Iawn"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Gorffen sefydlu"
msgid "web services under your control"
msgstr "gwasanaethau gwe a reolir gennych"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Allgofnodi"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 3c28222335f80afef41e7f294fb73f9be4832658..a04bf66d91c863f14644d43bc65148be4f59c0a2 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 0d6bc4131fda5510e85737f69702425750c8cd8a..7cd6f45cb5fa090c9dbd80692c2598d435ff91fa 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:40+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,87 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Yn cadw..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Amgryptiad"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Galluogwyd amgryptio ffeiliau."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Dim"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 08d181aa3b1e71886458cdd25b9f0874da46609d..78d44d150464823517112c5f9774a38f512de07c 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 8a848fc501098746ea886a269c917c51f2098e73..16f9054a7bf42f52950962c31ad6d4f080aaf1c0 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 14:47+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 675605ebaf8438cd0b6d2957e1d3db6e435a588c..b1fbd8c2afe3c8690606789b2083a9ccfca700be 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 14:48+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Methwyd dileu %s yn barhaol"
msgid "Couldn't restore %s"
msgstr "Methwyd adfer %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "gweithrediad adfer"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Gwall"
@@ -39,31 +39,31 @@ msgstr "Gwall"
msgid "delete file permanently"
msgstr "dileu ffeil yn barhaol"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Dileu'n barhaol"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Enw"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Wedi dileu"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 blygell"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} plygell"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ffeil"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ffeil"
diff --git a/l10n/cy_GB/files_versions.po b/l10n/cy_GB/files_versions.po
index 2d178293a3ace068fca6b03485a44634b8a082c6..ee2268ca74e97c311ce3894553a36d19d246d95a 100644
--- a/l10n/cy_GB/files_versions.po
+++ b/l10n/cy_GB/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index b0dbdfec6ce4e22d6aea32a1e25eb84d1c579f86..2c1e0f4aa05ed06bbc02cded7d6d040fac4a1a87 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 14:46+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Cymorth"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personol"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Gosodiadau"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Defnyddwyr"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Pecynnau"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Gweinyddu"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Mae llwytho ZIP wedi ei ddiffodd."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Nôl i Ffeiliau"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "methwyd pennu"
@@ -113,72 +113,76 @@ msgstr "%s does dim hawl defnyddio dot yn enw'r gronfa ddata"
msgid "%s set the database host."
msgstr "%s gosod gwesteiwr y gronfa ddata."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Enw a/neu gyfrinair Oracle annilys"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Enw a/neu gyfrinair MySQL annilys"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Gwall DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Gollwng y defnyddiwr hwn o MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Gollwng y defnyddiwr hwn o MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Enw a/neu gyfrinair Oracle annilys"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index bb6e0180eb05d7ebb3869f0dc1d71d850c8a8676..785015e3e9e4443be164072a331d8cf32f7d84b0 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 15:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Yn cadw..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "dadwneud"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grwpiau"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Dileu"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Cyfrinair"
@@ -423,39 +423,39 @@ msgstr "Cyfrinair newydd"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-bost"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Arall"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 2c054ee18927d5545db2004eded647f18036f313..99ba7c568e3e23f610337a11620a3cff32bf9ab0 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Gwall"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Cyfrinair"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Cymorth"
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
index 38625a8e005ab34d1314f5918504845cea120ef0..2f567efac8ec3b063b347c56e0cc657110c47dc7 100644
--- a/l10n/cy_GB/user_webdavauth.po
+++ b/l10n/cy_GB/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 5d4fa6016a7a31cffc72ee80f20dff6893b22aaf..2f425479b50e2a216add7f48c403552f7af56443 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "sidste år"
msgid "years ago"
msgstr "år siden"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vælg"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annuller"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vælg"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nej"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Afslut opsætning"
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Log ud"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 3fcfd963c4b867a6a42828a63b6c28a4c2ed5127..80a65611032b682437b0c68c64ab54ffca617ee4 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 9d253656f2dc15add4209dcf2df166bb477e8325..49b772ef5d44c43b58f78a129e297e0ce59aba81 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gemmer..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil kryptering aktiveret."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "De følgende filtyper vil ikke blive krypteret:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder de følgende fil typer fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 85d11b63bf13934a35ae98db118ecb1f48be2ed5..4ca39b66c4fae08cd5961c8e418d39c43240a16b 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 39cc42941ec6cd3c481ac481e912258f78576ed6..124f03c1e50b3f249ea7610c274ff4d460e4fa30 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index cad9f8798d8463102f4def051e686605f30e3a62..2fbadf71c60be9f42de14d6900e8372b0d8f7421 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Kunne ikke slette %s permanent"
msgid "Couldn't restore %s"
msgstr "Kunne ikke gendanne %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "udfør gendannelsesoperation"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Fejl"
@@ -39,31 +39,31 @@ msgstr "Fejl"
msgid "delete file permanently"
msgstr "slet fil permanent"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Slet permanent"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Navn"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Slettet"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mappe"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 4dcf5e81f4484ebd928afa98c20c531d2bfd35f5..23356455f8ad4de249771b40eb869e1b579320de 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index ac8b6efab1dc473ca57b79bc72ca2bdf1e3f7b4b..18172dd9f40188bb0bd1959c16062ddce0bda3e7 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjælp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personligt"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Indstillinger"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Brugere"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP-download er slået fra."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Filer skal downloades en for en."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Tilbage til Filer"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "De markerede filer er for store til at generere en ZIP-fil."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "kunne ikke fastslås"
@@ -113,72 +113,76 @@ msgstr "%s du må ikke bruge punktummer i databasenavnet."
msgid "%s set the database host."
msgstr "%s sæt database værten."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Databasefejl: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fejlende kommando var: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Slet denne bruger fra MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Slet denne bruger fra MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index a81909c3c7c09e2b864ab5b3f2ead54bfe403830..7dcf4dca63eb0c83bd33e52b0bf971cd579f3f72 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 13:50+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -125,44 +125,44 @@ msgstr "Opdateret"
msgid "Saving..."
msgstr "Gemmer..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "Slettet"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "fortryd"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Slet"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "Tilføj gruppe"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Et gyldigt brugernavn skal angives"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Fejl ved oprettelse af bruger"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
@@ -325,11 +325,11 @@ msgstr "Mere"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Version"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Hent applikationerne for at synkronisere dine filer"
msgid "Show First Run Wizard again"
msgstr "Vis Første Kørsels Guiden igen."
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Kodeord"
@@ -424,39 +424,39 @@ msgstr "Nyt kodeord"
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Skærmnavn"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Din emailadresse"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Sprog"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Loginnavn"
@@ -464,30 +464,34 @@ msgstr "Loginnavn"
msgid "Create"
msgstr "Ny"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard opbevaring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ubegrænset"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Andet"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Opbevaring"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "skift skærmnavn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "skift kodeord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index ed3dbcd50a30f8861c80fa9d2df614896da83ea5..f2c20cdc87e5253008f231c6e0dc3588c0a76179 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fejl"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "You can specify Base DN for users and groups in the Advanced tab"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Bruger DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Kodeord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Bruger Login Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Brugerliste Filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definere filteret der bruges ved indlæsning af brugere."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppe Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definere filteret der bruges når der indlæses grupper."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Brug TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Deaktiver SSL certifikat validering"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Anbefales ikke, brug kun for at teste."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "User Display Name Field"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base Bruger Træ"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjælp"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 0590c136e9223905d37dd25657ab132c72a4f9c9..9c0bc594ab88a033d8fb326eabded596bb9b7167 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
+# cronner <cronner@gmail.com>, 2012
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 87d896ee48a088fcc2a1d4102f19ee337fdcc003..d4327a141990275dfb1456941beb40d411270e73 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-11 17:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -215,26 +215,30 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Auswählen"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Auswählen"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nein"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -563,12 +567,12 @@ msgstr "Installation abschließen"
msgid "web services under your control"
msgstr "Web-Services unter Deiner Kontrolle"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Abmelden"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index fb3a8aac6c8900b45ed690676cc89e4939a36c33..8aa114e960f447842cc8f4a4cc3a8ba7d6615883 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index caaaa81d2b36575e20a96696cd7819478d4c7e4e..59cfb0e8e2cc0f0636ae728e32b6b42b74efcb18 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:54+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Dateiverschlüsselung ist aktiviert"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Schließe die folgenden Dateitypen von der Verschlüsselung aus:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nichts"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index aaa2995382cbb8fa8d8dffd97cbed44a2666c413..7afea52f30a13bc6f7c1c25088276baa4608efe7 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:55+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 3b551c20312333770f296fb63b9b57316848405a..e3c784db44c9a2120cc33df06ca2c464e2d1e8ba 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 19:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 57df6038e887acc2be30755f84ce45c0e1e04352..a2431575c2973b2580bf0cbf327959e3266c9681 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:58+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Konnte %s nicht dauerhaft löschen"
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "Wiederherstellung ausführen"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Fehler"
@@ -39,31 +39,31 @@ msgstr "Fehler"
msgid "delete file permanently"
msgstr "Datei dauerhaft löschen"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Name"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "gelöscht"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 Ordner"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 Datei"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 921aba68c41dc4a0a3e50d5f30c8439e6673cca2..24dc7347362b9ee228964ebb7443888b2eeed196 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:59+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 417ce173f3e59415b3d5f5c0eb34ab4029c94d31..e352851bf54884e3eaddaf2cb8c9cc88978d8056 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -18,47 +18,47 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hilfe"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persönlich"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Benutzer"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administration"
-#: files.php:207
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: files.php:208
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: files.php:239
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "konnte nicht festgestellt werden"
@@ -114,72 +114,76 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
msgid "%s set the database host."
msgstr "%s setze den Datenbank-Host"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle Benutzername und/oder Passwort ungültig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL Benutzername und/oder Passwort ungültig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fehler: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fehlerhafter Befehl war: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Lösche diesen Benutzer von MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Lösche diesen Benutzer aus MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 4a545152eed9de69138c07dd37e891805b29308d..20d97d2d8462d2fced897dc1e371a0d11e3e8343 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 22:00+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -138,16 +138,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Löschen"
@@ -155,15 +155,15 @@ msgstr "Löschen"
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
@@ -326,11 +326,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Version"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +401,7 @@ msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
msgid "Show First Run Wizard again"
msgstr "Erstinstallation erneut durchführen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passwort"
@@ -425,39 +425,39 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Anzeigename"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Deine E-Mail-Adresse"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hilf bei der Übersetzung"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Loginname"
@@ -465,30 +465,34 @@ msgstr "Loginname"
msgid "Create"
msgstr "Anlegen"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index ae5ea47d002498d89c7dff24004efc140b3efcdb..9b62916ffc4b4c96d773fdd9b7c5a2d663c25f2d 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 19:40+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
@@ -54,281 +58,363 @@ msgstr "Einstellungen beibehalten?"
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolgreich"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Verbindungstest erfolgreich"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Verbindungstest fehlgeschlagen"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverkonfiguration"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ein Basis-DN pro Zeile"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lasse die Felder DN und Passwort für anonymen Zugang leer."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Verbindungseinstellungen"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Konfiguration wird übersprungen wenn deaktiviert"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Backup Host (Kopie)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Backup Port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Schalte die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ordnereinstellungen"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kontingent Feld"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Standard Kontingent"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-Mail Feld"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testkonfiguration"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index a756a0d8570bd4070761fadd94c8dd1595f3aeaf..ff18551f627ecdcba47acd28a550ce98116d75a9 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <blobbyjj@ymail.com>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# <mibunrui@gmx.de>, 2013.
-# <seeed@freenet.de>, 2012.
+# Mirodin <blobbyjj@ymail.com>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# AndryXY <mibunrui@gmx.de>, 2013
+# seeed <seeed@freenet.de>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index da2cd95de1b4942b414176f93cf70340cec0948a..3ef98330906633c583e6c263734698030914de18 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-11 17:20+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -216,26 +216,30 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Auswählen"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Auswählen"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nein"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -564,12 +568,12 @@ msgstr "Installation abschließen"
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Abmelden"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 02b73e2efab442e09a952b4ec263bd49e38b48a0..2dd5d0dd85239f9e8aeadf7de064a8095f6e59f8 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -219,7 +220,7 @@ msgstr "{count} Dateien"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 6630efe37753be7a36e869471a2b504c0d4ef90d..c01a4a7f13ada33bb756e92db8f18df0068fcd31 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:54+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-01 01:58+0200\n"
+"PO-Revision-Date: 2013-05-31 22:00+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert."
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert."
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Das Passwort wurde erfolgreich geändert."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Datei-Verschlüsselung ist aktiviert"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Account-Passwort wiederherstellen"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Altes Passwort für die Account-Wiederherstellung"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Neues Passwort für die Account-Wiederherstellung"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nichts"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 7646967a4f957c2828e646601db79345735245f3..61ef1e033dcf6ccfc246e455c295bed283b0bbf5 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 5a9782beebe32d34baaae908c750cf85aeb63025..ddeb20030d3a1b1fb160afcfe584f9b92d1e247d 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index f05c61535a3b810398cbf799a6cc675fc1123319..ed2b66d7e9e634f68d8c19be2a417d0dea1de33e 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:58+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Konnte %s nicht dauerhaft löschen"
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "Wiederherstellung ausführen"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Fehler"
@@ -39,31 +39,31 @@ msgstr "Fehler"
msgid "delete file permanently"
msgstr "Datei dauerhaft löschen"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Name"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Gelöscht"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 Ordner"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 Datei"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 4218653d90afc783ce4487f67fad9af127c538f8..7d3c1a83c4472ed7dff76099fc21ffdeb139cebf 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 20:39+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index bcbe6b91ad29f65d4d78a24f1617c7d2fe532811..e13631a95ea8060ef3f68bbde20363cfbbe2b516 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 21:53+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hilfe"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persönlich"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Benutzer"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrator"
-#: files.php:207
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: files.php:208
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: files.php:239
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "konnte nicht ermittelt werden"
@@ -113,72 +114,76 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
msgid "%s set the database host."
msgstr "%s setze den Datenbank-Host"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle Benutzername und/oder Passwort ungültig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL Benutzername und/oder Passwort ungültig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fehler: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fehlerhafter Befehl war: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Lösche diesen Benutzer aus MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Lösche diesen Benutzer aus MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 9e82862dc2e2638db3c133c0dcfba5d8ec2ad195..bdca0febe3a23cd568af93b7badb4c1aab3eaef3 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -5,14 +5,15 @@
# Translators:
# a.tangemann <a.tangemann@web.de>, 2013
# arkascha <foss@christian-reiner.info>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 21:40+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -139,16 +140,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Löschen"
@@ -156,15 +157,15 @@ msgstr "Löschen"
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
@@ -327,11 +328,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Version"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -402,7 +403,7 @@ msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
msgid "Show First Run Wizard again"
msgstr "Den Einrichtungsassistenten erneut anzeigen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passwort"
@@ -426,39 +427,39 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Anzeigename"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Ihre E-Mail-Adresse"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Loginname"
@@ -466,30 +467,34 @@ msgstr "Loginname"
msgid "Create"
msgstr "Erstellen"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Admin-Paswort-Wiederherstellung"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 9fed068426fd75105c6047c06c7a2c4c08a1d95b..39f12159ddde17493d79f96d54195b22b5471a99 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 19:40+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +20,10 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
@@ -54,281 +60,363 @@ msgstr "Einstellungen beibehalten?"
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolg"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Verbindungstest erfolgreich"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Verbindungstest fehlgeschlagen"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverkonfiguration"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ein Basis-DN pro Zeile"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Verbindungseinstellungen"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Backup Host (Kopie)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Backup Port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ordnereinstellungen"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kontingent-Feld"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Standard-Kontingent"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-Mail-Feld"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interner Benutzername"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "UUID-Erkennung überschreiben"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID-Attribut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testkonfiguration"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 05ec894d85d6caa360148af893d9f8bba8898694..44670121a4ede3a026c0bd129edaca449cb756a4 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <a.tangemann@web.de>, 2012-2013.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# <multimill@gmail.com>, 2012.
-# <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
+# a.tangemann <a.tangemann@web.de>, 2012-2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index e5c54f4c71df8a48c2991ea37d11e5fc602678e5..7e9f3d98d4c1daba283068cf7f01db803552ff4e 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Wasilis <m.wasilis@yahoo.de>, 2013
+# Wasilis <inactive+Wasilis@transifex.com>, 2013
# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "τελευταίο χρόνο"
msgid "years ago"
msgstr "χρόνια πριν"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Οκ"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Επιλέξτε"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Άκυρο"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Επιλέξτε"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ναι"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Όχι"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Οκ"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -562,12 +566,12 @@ msgstr "Ολοκλήρωση εγκατάστασης"
msgid "web services under your control"
msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Αποσύνδεση"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 6f2c4fcdfa155e9228a6f8817a4f5333381e535b..7ab2df8363019703d7c4e1a8d51ffa3c50f5b9f1 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\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"
@@ -217,7 +218,7 @@ msgstr "{count} αρχεία"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index e3d818fc1b6cd199b84246cbb897805a090c67da..d5c014762f255de183c42ea7be5c4b07df75eff8 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Γίνεται αποθήκευση..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Κρυπτογράφηση"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Η κρυπτογράφηση αρχείων είναι ενεργή."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Οι παρακάτω τύποι αρχείων δεν θα κρυπτογραφηθούν:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Τίποτα"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 592955425a94de9e46cd68371945e7d1cc105f69..fc7d4ed7cce144318b42b8e44a59a8186402454c 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 793338e63d51ada745c6d4140211b64777761696..03675fb211413a572b359f0172d4e87f62695d99 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e4bef56ec1d43589e142f08b428a3d15889dac2e..cfdf141df089493bb00fcdcd7d2411af65bfbda7 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
msgid "Couldn't restore %s"
msgstr "Αδυναμία επαναφοράς %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "εκτέλεση λειτουργία επαναφοράς"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Σφάλμα"
@@ -39,31 +39,31 @@ msgstr "Σφάλμα"
msgid "delete file permanently"
msgstr "μόνιμη διαγραφή αρχείου"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Μόνιμη διαγραφή"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Όνομα"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Διαγράφηκε"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 αρχείο"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} αρχεία"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 12369ab3d423b1becbea60b8a4bb166592ee9bbb..c0a78762a845887bf4584d3ae2993b9cca6fd2b3 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index aa1aed6797dda23c88d5ef1dce27eea2eb32488b..b807ee9ae96de89585ca62392acf8e30744b1bce 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Βοήθεια"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Προσωπικά"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Χρήστες"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Εφαρμογές"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Διαχειριστής"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Η λήψη ZIP απενεργοποιήθηκε."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Πίσω στα Αρχεία"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "δεν μπορούσε να προσδιορισθεί"
@@ -113,72 +113,76 @@ msgstr "%s μάλλον δεν χρησιμοποιείτε τελείες στ
msgid "%s set the database host."
msgstr "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. "
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 120f0a31d12b3828a90af77c4226a1655c798c56..82c5279ebae341266cf9457d5bf839866118ddb6 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -125,44 +125,44 @@ msgstr "Ενημερώθηκε"
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "διαγράφηκε"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "αναίρεση"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίρεση χρήστη"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Ομάδες"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Ομάδα Διαχειριστών"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Διαγραφή"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "προσθήκη ομάδας"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Σφάλμα δημιουργίας χρήστη"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
@@ -325,11 +325,11 @@ msgstr "Περισσότερα"
msgid "Less"
msgstr "Λιγότερα"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Λήψη της εφαρμογής για συγχρονισμό των
msgid "Show First Run Wizard again"
msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Συνθηματικό"
@@ -424,39 +424,39 @@ msgstr "Νέο συνθηματικό"
msgid "Change password"
msgstr "Αλλαγή συνθηματικού"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Όνομα εμφάνισης"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Ηλ. ταχυδρομείο"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Γλώσσα"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφραση"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Όνομα Σύνδεσης"
@@ -464,30 +464,34 @@ msgstr "Όνομα Σύνδεσης"
msgid "Create"
msgstr "Δημιουργία"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Προκαθορισμένη Αποθήκευση "
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Απεριόριστο"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Άλλο"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Αποθήκευση"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "αλλαγή ονόματος εμφάνισης"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "επιλογή νέου κωδικού"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Προκαθορισμένο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 8b6e529e851592506e451bb2df53aa837857a753..fe6c6a8f1c710462ad04068a229ee77babee72a6 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Αποτυχία διαγραφής ρυθμίσεων διακομιστή"
@@ -53,281 +57,363 @@ msgstr "Διατήρηση ρυθμίσεων;"
msgid "Cannot add server configuration"
msgstr "Αδυναμία προσθήκης ρυθμίσεων διακομιστή"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Επιτυχία"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Επιτυχημένη δοκιμαστική σύνδεση"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Επιβεβαίωση Διαγραφής"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Ρυθμίσεις Διακομιστή"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Προσθήκη Ρυθμίσεων Διακομιστή"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Διακομιστής"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ένα DN Βάσης ανά γραμμή "
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Συνθηματικό"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "User Login Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "User List Filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Group Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Ρυθμίσεις Σύνδεσης"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Ενεργοποιηση ρυθμισεων"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. "
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Θύρα"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Host "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Απενεργοποιηση του κεντρικου διακομιστη"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Όταν ενεργοποιηθεί, με το ownCloud θα συνδεθείτε με το διακομιστή ρεπλίκα."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Χρήση TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ρυθμίσεις Καταλόγου"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Πεδίο Ονόματος Χρήστη"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base User Tree"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ένα DN βάσης χρηστών ανά γραμμή"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Χαρακτηριστικά αναζήτησης των χρηστών "
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή "
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Group Display Name Field"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Μια ομαδικη Βάση DN ανά γραμμή"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Ομάδα Χαρακτηριστικων Αναζήτηση"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Ειδικά Χαρακτηριστικά "
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Ποσοσταση πεδιου"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Προκαθισμενο πεδιο"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "σε bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Email τυπος"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Δοκιμαστικες ρυθμισεις"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Βοήθεια"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index 370f455b114dd2101fe0be36ebd3f760bb42c274..3a75e3ceaee1f04c8436901bdcff2572d50dfbe5 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
-# Marios Bekatoros <>, 2013.
+# Dimitris M. <monopatis@gmail.com>, 2012
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2012
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012
+# Marios Bekatoros <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 48961fc2a5891783181dfa48dfac096c081e11bd..63750feeb39d98c95228691c95e7cda1cb7b899e 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 04:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 754680e81f53a1c944a1f4d93269ab2ffc4c7506..1a2619c71ec223d3f3c1eead9e84033469ad2441 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index a45b1779141ac57b7cc134acc0e586c3c1e2dbe2..f27a3729d619264ef721582422ea391daa116379 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
index fefa9ba8f7988c2ddfc7e2a17937fda7f744a83e..a7724b86bee6b685af8bc83042b35e0f8992494f 100644
--- a/l10n/en@pirate/files_external.po
+++ b/l10n/en@pirate/files_external.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index b60b2651147884c077bcfbc712262119ddd1dd3f..f3c697a2c9893845af1ecde83f82c7df7f5f208e 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 04:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 9fd846e69515c58f0455c369f80985a2fcf8bef1..3ae46bccb49090d385f5bd9b8ccde433ad6dcf1f 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/en@pirate/files_versions.po b/l10n/en@pirate/files_versions.po
index b1e0a380e9596ea60410913506005bf255d80a3d..2df316a89241f58dd0b18adfc52dece6ca7d7b06 100644
--- a/l10n/en@pirate/files_versions.po
+++ b/l10n/en@pirate/files_versions.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 73994aee800093b51b4b7d61e9e9fa3b97eca0c3..be031f5ebd53adb8c5285c6071b60ba6711e81c0 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index ef0b0c8304f8f737997c4621d04550f6961d1f44..2dd26cf0d9d21d81c2968714e6eefb2e08b653d5 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passcode"
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 084c4ad5eddb318c766bc7f86e1c49b56a8b8def..ffa7973ace000da2b7ead4454ea1dc12ff90b9ef 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passcode"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/en@pirate/user_webdavauth.po b/l10n/en@pirate/user_webdavauth.po
index 18917231eb683c2be0b86820c9f2e374b0aa572c..055e077694ef7cc666fb06787c763457e5117b78 100644
--- a/l10n/en@pirate/user_webdavauth.po
+++ b/l10n/en@pirate/user_webdavauth.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2012-11-09 09:06+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index e012849caa0279cfbd10d232027509b3fcb6222a..b0942d2e860e9ce68ee46596c06da3dda5bf3b5b 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "lastajare"
msgid "years ago"
msgstr "jaroj antaŭe"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Akcepti"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Elekti"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Nuligi"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Elekti"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Akcepti"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Fini la instalon"
msgid "web services under your control"
msgstr "TTT-servoj regataj de vi"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Elsaluti"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 780fab4f57d72e83f6074926bb0d2dc27ec8d858..2928a0b2ceaf56af1ad15787b0930aa47c2e5703 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 8b1ceb53a9bada6454033a86f8f4da7c75403c70..907d1a9902edac5dad55f1898c48093106c738e5 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Konservante..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Ĉifrado"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenio"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index ef0f0605dd6e5dd1cee921feff94d7b9f79cb456..5191563428e3f795f459aeaffb26b53df0b570e9 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 4e6e0cbf14b1030775bc4fde420aa4ef7c0ad021..2b7afc9e2cf19c2f1a8adf790d7ef512dcf903ae 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index df836da8a10b3529f6a676e8983021c74e2c8c0d..67bafc70add172e71d187146801c0cb74dcb4d17 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Eraro"
@@ -39,31 +39,31 @@ msgstr "Eraro"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nomo"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 dosierujo"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} dosierujoj"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 dosiero"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} dosierujoj"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index f3fddd59090061d1a4771881f033d9332cc90b23..afca16226f037b0adb951968fca38198b982ab66 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index b88a2dd5e2c1b18d4a260e1976b6ae91a352e472..87d9e2acba3eaedc16fd22bc7494ea52e4266637 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Helpo"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persona"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Agordo"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Uzantoj"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikaĵoj"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administranto"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP-elŝuto estas malkapabligita."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Dosieroj devas elŝutiĝi unuope."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Reen al la dosieroj"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 24fba7f1cbd40a0b5020a858b4420770bd84c4fc..8ef84796bb463d1ba805661aa69a5a31a80228c2 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Konservante..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "forigita"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "malfari"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Forigi"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Pli"
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Pasvorto"
@@ -423,39 +423,39 @@ msgstr "Nova pasvorto"
msgid "Change password"
msgstr "Ŝanĝi la pasvorton"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Retpoŝto"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Via retpoŝta adreso"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Lingvo"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Krei"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Defaŭlta konservejo"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Senlima"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Alia"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Konservejo"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Defaŭlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 6a84048239c79a1ee871a14a4014544c465b0f96..423b1e96e445765db65391d6de9ed7c8e3dd917a 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukceso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Eraro"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Gastigo"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Bazo-DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Uzanto-DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Pasvorto"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtrilo de uzantensaluto"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtrilo de uzantolisto"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtrilo de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Pordo"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Uzi TLS-on"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ne rekomendata, uzu ĝin nur por testoj."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Kampo de vidignomo de uzanto"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Baza uzantarbo"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Kampo de vidignomo de grupo"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Baza gruparbo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asocio de grupo kaj membro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "duumoke"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Helpo"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index 8217ee0e2b9ccb3f2adac4e0784be30425c456a9..aa3b42b411916dd90f8e972606e3f77de8d49028 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mariano <mstreet@kde.org.ar>, 2013.
-# Mariano <mstreet@kde.org.ar>, 2012.
+# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index adabbb6dddc8c3e27439458b7f82df106414ec2e..acf3a5ce8886163d9c48121e07799ba7e45f6e20 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,13 +6,14 @@
# ggam <ggam@brainleakage.com>, 2013
# msoko <sokolovitch@yahoo.com>, 2013
# iGerli <stefano@aerosoles.net>, 2013
+# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 16:30+0000\n"
-"Last-Translator: ggam <ggam@brainleakage.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: xhiena <xhiena@gmail.com>\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"
@@ -215,26 +216,30 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "hace años"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Seleccionar"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Seleccionar"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Error cargando la plantilla del seleccionador de archivos"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Aceptar"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -563,12 +568,12 @@ msgstr "Completar la instalación"
msgid "web services under your control"
msgstr "Servicios web bajo su control"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s esta disponible. Obtener mas información de como actualizar."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Salir"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 70c4d26e3d5fc70c69edc40eb0b28528fbb2d799..686eeea90fb26adfd41190a9025ddb81e5404a64 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
# ggam <ggam@brainleakage.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\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"
@@ -218,7 +219,7 @@ msgstr "{count} archivos"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index b2a20b26ea12aa44f4440101eef57f91f5ac2659..21f59f5c76089d4638b236ff56d9215849a1da20 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# gmoriello <gmoriello@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-02 02:00+0200\n"
+"PO-Revision-Date: 2013-06-01 23:40+0000\n"
+"Last-Translator: gmoriello <gmoriello@gmail.com>\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"
@@ -17,22 +18,87 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Se ha habilitado la recuperación de archivos"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña."
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Clave de recuperación deshabilitada"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Su contraseña ha sido cambiada"
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La encriptacion de archivo esta activada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Habilitar clave de recuperación de contraseñas ():"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Recuperar contraseña"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Habilitar"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Cambiar clave de cifrado de contraseñas:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Contraseña de recuperación actual"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Contraseña de recuperación nueva"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Los siguientes tipos de archivo no seran encriptados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su contraseña"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir los siguientes tipos de archivo de la encriptacion:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Opciones de recuperación de archivos actualizada"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ninguno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 3160441fa9f38e0d331f22dd1769cf2192b8c90a..648f74a81164d41ef628303a6cc748fa41343b74 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index dde7058914d0bb8c09c7473470c2343fcb16563c..ee9aef9a9502ad145d5614f030655de17a6f35cd 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 85d553be40be9c17ecd1b3ae6b713fc9ab7eb279..4d786a12214c155e942adf96d65af5ae55ee628c 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "No se puede eliminar %s permanentemente"
msgid "Couldn't restore %s"
msgstr "No se puede restaurar %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Error"
@@ -39,31 +39,31 @@ msgstr "Error"
msgid "delete file permanently"
msgstr "Eliminar archivo permanentemente"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 carpeta"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} carpetas"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 archivo"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} archivos"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 5fc70f6e2ab7963b09f2fc94c1722b1369235676..89307a3c01eecd6eaf8b1b15156d7808d7674e57 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index cf73637ca6bdcc8e2238712613c33eeaaf538db1..e29d7af6c4455af18821fcde08ef97ec25d14322 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 16:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: xhiena <xhiena@gmail.com>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ayuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ajustes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuarios"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicaciones"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administración"
-#: files.php:207
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: files.php:208
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados uno por uno."
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Volver a Archivos"
-#: files.php:239
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "no pudo ser determinado"
@@ -113,72 +114,76 @@ msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
msgid "%s set the database host."
msgstr "%s ingresar el host de la base de datos."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Tiene que ingresar una cuenta existente o la del administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Usuario y/o contraseña de Oracle no válidos"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "No se pudo establecer la conexión a Oracle"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Usuario y/o contraseña de MySQL no válidos"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Comando infractor: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Usuario MySQL '%s'@'localhost' ya existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Eliminar este usuario de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuario MySQL '%s'@'%%' ya existe"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Eliminar este usuario de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Usuario y/o contraseña de Oracle no válidos"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Usuario y/o contraseña de MS SQL no válidos: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 01d9ecc8223cc57c6dc3294178f1e3424887a2af..353d8839be50ad92c627b87fa3d434e5357a0eb7 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
# ggam <ggam@brainleakage.com>, 2013
# scambra <sergio@programatica.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 18:00+0000\n"
-"Last-Translator: ggam <ggam@brainleakage.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\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"
@@ -126,44 +127,44 @@ msgstr "Actualizado"
msgid "Saving..."
msgstr "Guardando..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "borrado"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "deshacer"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "No se puede eliminar el usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo administrador"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eliminar"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "añadir Grupo"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Se debe usar un nombre de usuario válido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Error al crear usuario"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Se debe usar una contraseña valida"
@@ -326,11 +327,11 @@ msgstr "Más"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +402,7 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar asistente para iniciar otra vez"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contraseña"
@@ -425,39 +426,39 @@ msgstr "Nueva contraseña"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nombre a mostrar"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Su dirección de correo"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ayúdnos a traducir"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nombre de usuario"
@@ -465,30 +466,34 @@ msgstr "Nombre de usuario"
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperación de la contraseña de administración"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Almacenamiento predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Otro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Cambiar nombre a mostrar"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 7c1c605a2ab065d57a9ca46f5036b3a27676de71..5842c6f8db8bc729d2af2f9fad2874244f88d7da 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# ordenet <roberto@ordenet.com>, 2013
+# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: xhiena <xhiena@gmail.com>\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"
@@ -17,6 +20,10 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Ocurrió un fallo al borrar las asignaciones."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "No se pudo borrar la configuración del servidor"
@@ -43,7 +50,7 @@ msgstr "Falló el borrado"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr "Hacerse cargo de los ajustes de configuración del servidor reciente?"
+msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
#: js/settings.js:83
msgid "Keep settings?"
@@ -53,281 +60,363 @@ msgstr "Mantener la configuración?"
msgid "Cannot add server configuration"
msgstr "No se puede añadir la configuración del servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Asignaciones borradas"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Éxito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "La prueba de conexión fue exitosa"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "La prueba de conexión falló"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar eliminación"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
+msgstr "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuración del Servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Agregar configuracion del servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN Base por línea"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
+msgstr "usar %%uid como comodín, ej: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin placeholder, ej: \"objectClass=person\"."
+msgstr "Sin comodines, ej: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
+msgstr "sin comodines, ej: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
-msgstr "Configuracion de coneccion"
+msgstr "Configuración de conexión"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuracion activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Cuando deseleccione, esta configuracion sera omitida."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
-msgstr "Host para backup (Replica)"
+msgstr "Servidor de copia de seguridad (Replica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
-msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
+msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
-msgstr "Puerto para backup (Replica)"
+msgstr "Puerto para copias de seguridad (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deshabilitar servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
+msgstr "Cuando se inicie, ownCloud unicamente conectará al servidor replica"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
+msgstr "No lo use para conexiones LDAPS, Fallará."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
-msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
+msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Apagar la validación por certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache TTL"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
-msgstr "en segundos. Un cambio vacía la cache."
+msgstr "en segundos. Un cambio vacía la caché."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Configuracion de directorio"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN Base de Usuario por línea"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de la busqueda de usuario"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por linea"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN Base de Grupo por línea"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de busqueda de grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos especiales"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Cuota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-mail"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regla para la carpeta Home de usuario"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nombre de usuario interno"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Por defecto el nombre de usuario interno será creado desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente quitados. En coincidencias un número será añadido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es también el nombre por defecto para la carpeta personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. Déjalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo Nombre de usuario Interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Sobrescribir la detección UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los nuevos usuarios y grupos de LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Asignación del Nombre de usuario de un usuario LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud utiliza nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Configuración de prueba"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 305a875650d680849ee73030cccb52c39c87a214..9b520ddeaaebbe418cc0a94fb127fa7967659a25 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-# Art O. Pal <artopal@fastmail.fm>, 2012.
-# <pggx999@gmail.com>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2012
+# pggx999 <pggx999@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 1e5bebb11e358e53a745ba83674aee0620f14378..cf39a7e53930272864c3456823fe34883e439d61 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "años atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Elegir"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Elegir"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Aceptar"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Completar la instalación"
msgid "web services under your control"
msgstr "servicios web controlados por vos"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Cerrar la sesión"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 1341e2989fe763bbb513fe6dabedcacb5a9af293..dd55de5889c9c291e55f077c1871e58927b8d649 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} archivos"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 08c82d2bc8cc80468c514fd549526ed99214bcaa..0fd32631ce919c5d3c548ee97235a9dbd4c5d738 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Encriptación"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La encriptación de archivos no está habilitada"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Los siguientes tipos de archivos no serán encriptados"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir los siguientes tipos de archivos de encriptación:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ninguno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index f2b512a503ca61491922ac3e883f55561899c317..10c00b1fd936715bbc08cbe9f8466793616e83ad 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 75310dddcc31bf98f0e4cc00c21b6a06b754ca34..e1fb66bf96dacc6ee2d8a35668a54d890c75b659 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 3912933c0c34f7d16a90d285c9a558b25fcbd376..0be5f1364f52c73d2f4730cd00d51933579580a4 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "No fue posible borrar %s de manera permanente"
msgid "Couldn't restore %s"
msgstr "No se pudo restaurar %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Error"
@@ -39,31 +39,31 @@ msgstr "Error"
msgid "delete file permanently"
msgstr "Borrar archivo de manera permanente"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Borrar de manera permanente"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Borrado"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 directorio"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} directorios"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 archivo"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} archivos"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 623368fabec30428a735ba4170a664a760a4e5fb..956dd59f216fabc314499840f2720389fcf049f9 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d22bcbdee2f8a81edb92ab51081a533fad098ba8..518d7dfe307f855e43184873016b63f65b14ef6d 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ayuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configuración"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuarios"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicaciones"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administración"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados de a uno."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Volver a archivos"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "no pudo ser determinado"
@@ -113,72 +113,76 @@ msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
msgid "%s set the database host."
msgstr "%s Especifique la dirección de la Base de Datos"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Debe ingresar una cuenta existente o el administrador"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "El nombre de usuario y contraseña no son válidos"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Usuario y/o contraseña MySQL no válido"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "El comando no comprendido es: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Usuario MySQL '%s'@'localhost' ya existente"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Borrar este usuario de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuario MySQL '%s'@'%%' ya existente"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Borrar este usuario de MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "El nombre de usuario y contraseña no son válidos"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 7e2eabe42cfd135ce3e3eb5a83df1f90236e68b3..61bfae4d5fd2221b96046affbbb1bab33d111444 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +29,7 @@ msgstr "Error al autenticar"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "El nombre mostrado fue cambiado"
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
@@ -124,44 +125,44 @@ msgstr "Actualizado"
msgid "Saving..."
msgstr "Guardando..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "borrado"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "deshacer"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Imposible remover usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Borrar"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "Agregar grupo"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Debe ingresar un nombre de usuario válido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Error creando usuario"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Debe ingresar una contraseña válida"
@@ -324,11 +325,11 @@ msgstr "Más"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +400,7 @@ msgstr "Obtené aplicaciones para sincronizar tus archivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar de nuevo el asistente de primera ejecución"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contraseña"
@@ -423,39 +424,39 @@ msgstr "Nueva contraseña:"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nombre a mostrar"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Correo Electrónico"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Tu dirección de e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nombre de "
@@ -463,30 +464,34 @@ msgstr "Nombre de "
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Almacenamiento Predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Otros"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Cambiar el nombre que se muestra"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index e5394097ae87fbdba3e427babf74a4c9d66cbc68..3155fed37457ac6edcedaa21e5bd144eb97d5518 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Fallo al borrar la configuración del servidor"
@@ -53,281 +57,363 @@ msgstr "¿Mantener preferencias?"
msgid "Cannot add server configuration"
msgstr "No se pudo añadir la configuración del servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Éxito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "El este de conexión ha sido completado satisfactoriamente"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Falló es test de conexión"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "¿Realmente desea borrar la configuración actual del servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar borrado"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuración del Servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Añadir Configuración del Servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Una DN base por línea"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar cuando se obtienen grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Configuración de Conección"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuración activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Si no está seleccionada, esta configuración será omitida."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host para copia de seguridad (réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Puerto para copia de seguridad (réplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deshabilitar el Servidor Principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Al comenzar, ownCloud se conectará únicamente al servidor réplica"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desactivar la validación por certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Tiempo de vida del caché"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Cambiarlo vacía la cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Configuración de Directorio"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Una DN base de usuario por línea"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de la búsqueda de usuario"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por linea"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Una DN base de grupo por línea"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de búsqueda de grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos Especiales"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo de cuota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo de e-mail"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regla de nombre de los directorios de usuario"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Probar configuración"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 2d5007b68eab54574a821e53bdf02bebc4d4e743..752a64616bb247cd971e3cb56a589e28b0bcff1a 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-# <claudio.tessone@gmail.com>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012
+# cjtess <claudio.tessone@gmail.com>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 0a1d8b4be02ac2e5f57703c4fe78ec2376e17b93..baa273912541c09b9d1b26a9b873c55186e897ca 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 09:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "User %s shared a file with you"
-msgstr "Kasutaja %s jagas Sinuga faili"
+msgstr "Kasutaja %s jagas sinuga faili"
#: ajax/share.php:99
#, php-format
@@ -34,14 +34,14 @@ msgstr "Kasutaja %s jagas Sinuga kausta."
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr "Kasutaja %s jagas Sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s"
+msgstr "Kasutaja %s jagas sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s"
#: ajax/share.php:104
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr "Kasutaja %s jagas Sinuga kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s"
+msgstr "Kasutaja %s jagas sinuga kausta \"%s\". See on allalaadimiseks saadaval siin: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -80,7 +80,7 @@ msgstr "Kustutamiseks pole kategooriat valitud."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr "Viga %s eemaldamisel lemmikutest"
+msgstr "Viga %s eemaldamisel lemmikutest."
#: js/config.php:34
msgid "Sunday"
@@ -214,26 +214,30 @@ msgstr "viimasel aastal"
msgid "years ago"
msgstr "aastat tagasi"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vali"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Loobu"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vali"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Viga failivalija malli laadimisel"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -249,7 +253,7 @@ msgstr "Viga"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr "Rakenduse nimi ole määratletud"
+msgstr "Rakenduse nimi ole määratletud."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
@@ -373,11 +377,11 @@ msgstr "Viga aegumise kuupäeva määramisel"
#: js/share.js:604
msgid "Sending ..."
-msgstr "Saadan ..."
+msgstr "Saatmine ..."
#: js/share.js:615
msgid "Email sent"
-msgstr "Email saadetud"
+msgstr "E-kiri on saadetud"
#: js/update.js:14
msgid ""
@@ -403,7 +407,7 @@ msgid ""
"The link to reset your password has been sent to your email.<br>If you do "
"not receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator ."
-msgstr "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt."
+msgstr "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt."
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -510,7 +514,7 @@ msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
"target=\"_blank\">documentation</a>."
-msgstr "Serveri korrektseks seadistuseks palun tutvu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>."
+msgstr "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>."
#: templates/installation.php:44
msgid "Create an <strong>admin account</strong>"
@@ -560,14 +564,14 @@ msgstr "Lõpeta seadistamine"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "veebitenused sinu kontrolli all"
+msgstr "veebiteenused sinu kontrolli all"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Logi välja"
@@ -579,7 +583,7 @@ msgstr "Automaatne sisselogimine lükati tagasi!"
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!"
+msgstr "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
@@ -599,7 +603,7 @@ msgstr "Logi sisse"
#: templates/login.php:47
msgid "Alternative Logins"
-msgstr "Alternatiivsed meldimised"
+msgstr "Alternatiivsed sisselogimisviisid"
#: templates/part.pagenavi.php:3
msgid "prev"
@@ -612,4 +616,4 @@ msgstr "järgm"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Uuendan ownCloudi versioonile %s. Läheb pisut aega."
+msgstr "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 1b7c5d883780ec984c00d77f268c54dbf78f2d0b..50518ecb5a765d24e242bf509f9fb2d3415ac9df 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
@@ -39,7 +40,7 @@ msgstr "Ühtegi tõrget polnud, fail on üles laetud"
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse"
+msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:"
#: ajax/upload.php:29
msgid ""
@@ -125,11 +126,11 @@ msgstr "teosta kustutamine"
#: js/filelist.js:413
msgid "1 file uploading"
-msgstr "1 faili üleslaadimisel"
+msgstr "1 fail üleslaadimisel"
#: js/filelist.js:416 js/filelist.js:470
msgid "files uploading"
-msgstr "failide üleslaadimine"
+msgstr "faili üleslaadimisel"
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -147,7 +148,7 @@ msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatu
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!"
+msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
@@ -157,7 +158,7 @@ msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. "
+msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -174,7 +175,7 @@ msgstr "Üleslaadimine tühistati."
#: js/files.js:413
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
+msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
#: js/files.js:486
msgid "URL cannot be empty."
@@ -218,7 +219,7 @@ msgstr "{count} faili"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
#: lib/app.php:73
msgid "Unable to rename file"
@@ -312,7 +313,7 @@ msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetav
#: templates/index.php:114
msgid "Files are being scanned, please wait."
-msgstr "Faile skannitakse, palun oota"
+msgstr "Faile skannitakse, palun oota."
#: templates/index.php:117
msgid "Current scanning"
@@ -320,4 +321,4 @@ msgstr "Praegune skannimine"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "Uuendan failisüsteemi puhvrit..."
+msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 9850a24ab4d904ad066c6f13eda9303bcdd5d83c..2bcdd23d94336006fee3f5e578d7221873f695eb 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:12+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 08:30+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -17,22 +19,87 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Taastevõtme lubamine õnnestus"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Taastevõtme keelamine õnnestus"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Parool edukalt vahetatud."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Salvestamine..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Krüpteerimine"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Faili krüpteerimine on sisse lülitatud."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Konto taasteparool"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Sisse lülitatud"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Väljalülitatud"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Muuda taaste võtme krüpteerimise paroole:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Konto vana taaste parool"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Konto uus taasteparool"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Muuda parooli"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Luba parooli taaste jagades kõik failid administraatoriga:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Järgnevaid failitüüpe ei krüpteerita:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parool on kadunud"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Järgnevaid failitüüpe ei krüpteerita:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Faili taaste seaded uuendatud"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Pole"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Ei suuda uuendada taastefaili"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index bcacfde3df377b998573c5badf76951377eee52c..0cf16cec04e745e51bb272e6c796b3159aa6e53b 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index a698beda26a910b46da3791e90cc5025b9a9cbf1..f1913930b3a322affba61f97c3ca76875bb925f4 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:07+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 9e8889d3a7d4dadee290b5415be0b8e63759a4b6..9341e71a33f77a4428d56d1efd3f12793d72c66b 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:11+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
msgid "Couldn't restore %s"
msgstr "%s ei saa taastada"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "soorita taastamine"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Viga"
@@ -39,31 +39,31 @@ msgstr "Viga"
msgid "delete file permanently"
msgstr "kustuta fail jäädavalt"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Kustuta jäädavalt"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nimi"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Kustutatud"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 kaust"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} kausta"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fail"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} faili"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 570e7d1253e828cc9bdf2db43ea97a72e2fcd5e2..6be6fc45ff4528470a63258c450caefcfae208d4 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:20+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 6cca7168ed15097d96da8249aa721af62c74e9bb..11702fe711ce98d9f37142f811c54595c42f8b61 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -18,49 +19,49 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Abiinfo"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Isiklik"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Seaded"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Kasutajad"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Rakendused"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP-ina allalaadimine on välja lülitatud."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Failid tuleb alla laadida ükshaaval."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Tagasi failide juurde"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
-msgstr "Ei suuda tuvastada"
+msgstr "ei suudetud tuvastada"
#: json.php:28
msgid "Application is not enabled"
@@ -114,72 +115,76 @@ msgstr "%s punktide kasutamine andmebaasi nimes pole lubatud"
msgid "%s set the database host."
msgstr "%s määra andmebaasi server."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Sisesta kas juba olemasolev konto või administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Ei suuda luua ühendust Oracle baasiga"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Andmebaasi viga: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Tõrkuv käsk oli: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Kustuta see kasutaja MySQL-ist"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Kustuta see kasutaja MySQL-ist."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 1724aa9431ab68e4b0b49fdcc0e46c661490c5d5..aa4192988acf9aba648fae8c6daa72a6bfb87e06 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 09:30+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -125,44 +126,44 @@ msgstr "Uuendatud"
msgid "Saving..."
msgstr "Salvestamine..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "kustutatud"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "tagasi"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
-msgstr "Ei suuda kustutada kasutajat eemaldada"
+msgstr "Kasutaja eemaldamine ebaõnnestus"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupid"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupi admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Kustuta"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "lisa grupp"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Sisesta nõuetele vastav kasutajatunnus"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Viga kasutaja loomisel"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
@@ -325,11 +326,11 @@ msgstr "Rohkem"
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "Hangi rakendusi failide sünkroniseerimiseks"
msgid "Show First Run Wizard again"
msgstr "Näita veelkord Esmase Käivituse Juhendajat"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parool"
@@ -424,39 +425,39 @@ msgstr "Uus parool"
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Näidatav nimi"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Sinu e-posti aadress"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Keel"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Kasutajanimi"
@@ -464,30 +465,34 @@ msgstr "Kasutajanimi"
msgid "Create"
msgstr "Lisa"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Admin taasteparool"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Vaikimisi maht"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Piiramatult"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Muu"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Maht"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "muuda näidatavat nime"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "määra uus parool"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index a173e5abffe9d6fec5e0d6f84be7da67189a5550..aaf1de90aefeceb307a83621ad391dee080c0a27 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 09:30+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -18,6 +19,10 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Vastendususte puhastamine ebaõnnestus."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Serveri seadistuse kustutamine ebaõnnestus"
@@ -48,287 +53,369 @@ msgstr "Võta sätted viimasest serveri seadistusest?"
#: js/settings.js:83
msgid "Keep settings?"
-msgstr "Säilitada seadistus?"
+msgstr "Säilitada seadistused?"
#: js/settings.js:97
msgid "Cannot add server configuration"
msgstr "Ei suuda lisada serveri seadistust"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "vastendused puhastatud"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Korras"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Viga"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
-msgstr "Test ühendus õnnestus"
+msgstr "Ühenduse testimine õnnestus"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
-msgstr "Test ühendus ebaõnnestus"
+msgstr "Ühenduse testimine ebaõnnestus"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Kinnita kustutamine"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serveri seadistus"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Lisa serveri seadistus"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Baas DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Üks baas-DN rea kohta"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Kasutaja DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parool"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Kasutajanime filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Kasutajate nimekirja filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupi filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Ühenduse seaded"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Seadistus aktiivne"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Kui märkimata, siis seadistust ei kasutata"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Varuserver"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Varuserveri (replika) port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Ära kasuta peaserverit"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Märgituna ownCloud ühendub ainult varuserverisse."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Kasuta TLS-i"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS puhul ära kasuta. Ühendus ei toimi."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Mittetõstutundlik LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Lülita SSL sertifikaadi kontrollimine välja."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Pole soovitatav, kasuta ainult testimiseks."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Puhvri iga"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekundites. Muudatus tühjendab vahemälu."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Kataloogi seaded"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Kasutaja näidatava nime väli"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Baaskasutaja puu"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Üks kasutajate baas-DN rea kohta"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Kasutaja otsingu atribuudid"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Valikuline; üks atribuut rea kohta"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Grupi näidatava nime väli"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Baasgrupi puu"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Üks grupi baas-DN rea kohta"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Grupi otsingu atribuudid"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Grupiliikme seotus"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Spetsiifilised atribuudid"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Mahupiirangu atribuut"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Vaikimisi mahupiirang"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "baitides"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Email atribuut"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Kasutaja kodukataloogi nimetamise reegel"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Sisemine kasutajanimi"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Sisemise kasutajatunnuse atribuut:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Tühista UUID tuvastus"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID atribuut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testi seadistust"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Abiinfo"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index b1ac57ddbf92acb421ffe253fc8f267e9e136bd3..ee2a1e41f432586905c1529ff99d03e54240d4c0 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 19:19+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 7f5af267bd9e6a6c07fc19d8cb713cd59c393046..ca6ed1e86d0435df023dfbbb68f3b35ecbf4917f 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "joan den urtean"
msgid "years ago"
msgstr "urte"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ados"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Aukeratu"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Aukeratu"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ez"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ados"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Bukatu konfigurazioa"
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Saioa bukatu"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index fd7b57bfd49f710b7bb52b11d2381fd1950eea47..78cba47346eca827e8f59c81cf8d45a9e7a7cfac 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 40ebdc5fdf8b2108f15317afd2eb55454897d2db..1e367b1e9c5d1643b5d205df606663232a557537 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gordetzen..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Enkriptazioa"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fitxategien enkriptazioa gaituta dago."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Hurrengo fitxategi motak ez dira enkriptatuko:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Baztertu hurrengo fitxategi motak enkriptatzetik:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ezer"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index f6059f32883db199dc9dab4d865f8f231350425e..11b9c655de8ffe7f6d9ab8d1f7fcd119001769cf 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index ca0772183cff1c999890525577dba1bc93a894b8..5b5bb58738425ce1c2a505ec9b48876ebb801bba 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index d86ad26b2e0ad6cac6413a17a56d831a6d26e6d0..649a2d0cfb395b355f5a615bb1f0f75cbf284991 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Ezin izan da %s betirako ezabatu"
msgid "Couldn't restore %s"
msgstr "Ezin izan da %s berreskuratu"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "berreskuratu"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Errorea"
@@ -39,31 +39,31 @@ msgstr "Errorea"
msgid "delete file permanently"
msgstr "ezabatu fitxategia betirako"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Ezabatu betirako"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Izena"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Ezabatuta"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "karpeta bat"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} karpeta"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "fitxategi bat"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} fitxategi"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index c7a497b929bea7cf988a85b7024457519d4ec007..284ceaf733e1d97474d2650d119d6541189bd81b 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 2319ead91094f47e0be4d26a48a3ff6c9a63c2db..4f53b771f66959ab5d374d3fe5a55ca709de5c57 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Laguntza"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pertsonala"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ezarpenak"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Erabiltzaileak"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikazioak"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP deskarga ez dago gaituta."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Fitxategiak banan-banan deskargatu behar dira."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Itzuli fitxategietara"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "ezin izan da zehaztu"
@@ -113,72 +113,76 @@ msgstr "%s ezin duzu punturik erabili datu basearen izenean."
msgid "%s set the database host."
msgstr "%s sartu datu basearen hostalaria."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB errorea: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Errorea komando honek sortu du: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Ezabatu erabiltzaile hau MySQLtik"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Ezabatu erabiltzaile hau MySQLtik."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 229680c871bc787de47a5f2a3ef85eebd312f626..c46f05695ce743c03ceec67ca3ccd65262f00a9a 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Eguneratuta"
msgid "Saving..."
msgstr "Gordetzen..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "ezabatuta"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "desegin"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Ezabatu"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "gehitu taldea"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Baliozko erabiltzaile izena eman behar da"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Errore bat egon da erabiltzailea sortzean"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
@@ -324,11 +324,11 @@ msgstr "Gehiago"
msgid "Less"
msgstr "Gutxiago"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
msgid "Show First Run Wizard again"
msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Pasahitza"
@@ -423,39 +423,39 @@ msgstr "Pasahitz berria"
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Bistaratze Izena"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-posta"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Zure e-posta"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Hizkuntza"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Sarrera Izena"
@@ -463,30 +463,34 @@ msgstr "Sarrera Izena"
msgid "Create"
msgstr "Sortu"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Lehenetsitako Biltegiratzea"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Mugarik gabe"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Bestelakoa"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Biltegiratzea"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "aldatu bistaratze izena"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ezarri pasahitz berria"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 396651c963a96d3b7ce0f89de745f584c84f5795..0c4381c59a7a4c58c8568e11b752b24e71410ba8 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du"
@@ -53,281 +57,363 @@ msgstr "Mantendu ezarpenak?"
msgid "Cannot add server configuration"
msgstr "Ezin da zerbitzariaren konfigurazioa gehitu"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Arrakasta"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Errorea"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Konexio froga ongi burutu da"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Konexio frogak huts egin du"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Baieztatu Ezabatzea"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Zerbitzariaren konfigurazioa"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Gehitu Zerbitzariaren Konfigurazioa"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Hostalaria"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Oinarrizko DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "DN Oinarri bat lerroko"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Erabiltzaile DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Pasahitza"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Erabiltzaileen saioa hasteko iragazkia"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Erabiltzaile zerrendaren Iragazkia"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Taldeen iragazkia"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Konexio Ezarpenak"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurazio Aktiboa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Portua"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Babeskopia (Replica) Ostalaria"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Babeskopia (Replica) Ataka"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desgaitu Zerbitzari Nagusia"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Erabili TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Katxearen Bizi-Iraupena"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "segundutan. Aldaketak katxea husten du."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Karpetaren Ezarpenak"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Oinarrizko Erabiltzaile Zuhaitza"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Erabiltzaile DN Oinarri bat lerroko"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Erabili Bilaketa Atributuak "
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Taldeen bistaratzeko izena duen eremua"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Oinarrizko Talde Zuhaitza"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Talde DN Oinarri bat lerroko"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Taldekatu Bilaketa Atributuak "
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Talde-Kide elkarketak"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributu Bereziak"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kuota Eremua"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Kuota Lehenetsia"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "bytetan"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Eposta eremua"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Egiaztatu Konfigurazioa"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Laguntza"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index 7128f70cb6a1bc9da552ecfa3f3d1edabb014079..c9297b3ff2eeafbef61fd740c64b81fb2dee6033 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <asieriko@gmail.com>, 2013.
-# <asieriko@gmail.com>, 2012.
+# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 5e282fc91e9621c675c8dd84273eaf2e36cc8a40..c5157131f542ef7c767c77cdc2540dcd53ba5f27 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "سال قبل"
msgid "years ago"
msgstr "سالهای قبل"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "قبول"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "انتخاب کردن"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "منصرف شدن"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "انتخاب کردن"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "نه"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "قبول"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "اتمام نصب"
msgid "web services under your control"
msgstr "سرویس های تحت وب در کنترل شما"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "خروج"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index d066b537fc251d364eff70a285c5683944b1f171..6ef2b14e0ad9db986c094a056b2671e55c66ca8b 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index fef3cfd1926cbc8ea933680376569c6ee86c9370..67d35105e3b406fc3a513458e3cec20e51bc3853 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "در حال ذخیره سازی..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "رمزگذاری"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "رمزنگاری فایلها فعال شد."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "فایلهای زیر رمزنگاری نخواهند شد:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "فایلهای زیر از رمزنگاری نادیده گرفته می شوند:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "هیچکدام"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index d9f3a99ddfa6f2e5556b68ed77880704a76d40b0..6b9d66b9379c4632ef41ba54e7140ad8096472b3 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9bc4ac8a323d44316e9e6b4d7e0c343c29eeb078..ee80c80cffc67d0579439b68b5d957eb2df9d24a 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index b513c23be8b92d5ab7aae881f134b26bd05b9793..5160bbb6762b9b6329519062fa25b6fe781bb0f4 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "%s را نمی توان برای همیشه حذف کرد"
msgid "Couldn't restore %s"
msgstr "%s را نمی توان بازگرداند"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "انجام عمل بازگرداندن"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "خطا"
@@ -39,31 +39,31 @@ msgstr "خطا"
msgid "delete file permanently"
msgstr "حذف فایل برای همیشه"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "حذف قطعی"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "نام"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "حذف شده"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 پوشه"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{ شمار} پوشه ها"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 پرونده"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{ شمار } فایل ها"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 15fe4b1b74237b16f21a289c546f4d69c3884704..191735399243abb2995b1067316cd603ffa8d1f6 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 41bd3beeae7a456a7160a4a2a71f628d9444d6bd..a2961ae8a0f2444ac544a4ae45e0005fd7f75386 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "راهنما"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "شخصی"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "تنظیمات"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "کاربران"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr " برنامه ها"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "مدیر"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "دانلود به صورت فشرده غیر فعال است"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "بازگشت به فایل ها"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index a9623596238e74afc183b0d59a54cdb5b8b8adeb..1d1284b04ef0719c5b4bac9023a71e1785e2f4e2 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "بروز رسانی انجام شد"
msgid "Saving..."
msgstr "در حال ذخیره سازی..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "حذف شده"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "بازگشت"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "حذف کاربر امکان پذیر نیست"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "گروه ها"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "حذف"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "افزودن گروه"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "نام کاربری صحیح باید وارد شود"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "خطا در ایجاد کاربر"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "رمز عبور صحیح باید وارد شود"
@@ -324,11 +324,11 @@ msgstr "بیشتر"
msgid "Less"
msgstr "کمتر"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "برنامه ها را دریافت کنید تا فایل هایتان
msgid "Show First Run Wizard again"
msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "گذرواژه"
@@ -423,39 +423,39 @@ msgstr "گذرواژه جدید"
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "نام نمایشی"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "ایمیل"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "پست الکترونیکی شما"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "زبان"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت فایل خودتان استفاده کنید"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "نام کاربری"
@@ -463,30 +463,34 @@ msgstr "نام کاربری"
msgid "Create"
msgstr "ایجاد کردن"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "ذخیره سازی پیش فرض"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "نامحدود"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "دیگر"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "حافظه"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "تغییر نام نمایشی"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "تنظیم کلمه عبور جدید"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "پیش فرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index a5b101124fb8d95ca7be9aa3829ea8f5fb584094..1c94dc4aea40c3fb3d161dcbb9d1d1b26c37ceca 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "عملیات حذف پیکربندی سرور ناموفق ماند"
@@ -53,281 +57,363 @@ msgstr "آیا تنظیمات ذخیره شود ؟"
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "خطا"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "تست اتصال با موفقیت انجام گردید"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "تست اتصال ناموفق بود"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "تایید حذف"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "پیکربندی سرور"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "افزودن پیکربندی سرور"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "میزبانی"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "گذرواژه"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "فیلتر گروه"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "درگاه"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "در بایت"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "راهنما"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 5b69bafee6b7455ce577debd49e35bedc60779f2..f89e5c1febbda3f5564b596c173c4a214bedfc51 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 03746586e2ac30cbaa97451e68d612f99682f22b..2155ced94251ad5d6d8c58911cc3ae4a6a99b905 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr ""
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index a43906c14d2736c0f8161dcd5f38039d2dfc8b3c..127a50cbd0de582f49ff37a8152f7c6e17fb2ab3 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/fi/files_encryption.po b/l10n/fi/files_encryption.po
index 8aa6088c38ea9e8879dc9340be9a7ab49a55393c..93c8ed46e2f2f38efa36a73a84197f91e49c2098 100644
--- a/l10n/fi/files_encryption.po
+++ b/l10n/fi/files_encryption.po
@@ -7,28 +7,97 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/fi/files_external.po b/l10n/fi/files_external.po
index d37cbbef3786a7de4fe6a0c0705a27a26e00c067..3281188f3b4d0f58ccd25932dc380f4ef5ef0105 100644
--- a/l10n/fi/files_external.po
+++ b/l10n/fi/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,90 +17,107 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
msgid "Access granted"
msgstr ""
-#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
msgid "Error configuring Dropbox storage"
msgstr ""
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+#: js/dropbox.js:65 js/google.js:66
msgid "Grant access"
msgstr ""
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr ""
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
msgstr ""
-#: js/google.js:26 js/google.js:73 js/google.js:78
+#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
msgstr ""
+#: lib/config.php:431
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:437
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
-#: templates/settings.php:7 templates/settings.php:19
-msgid "Mount point"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
msgstr ""
-#: templates/settings.php:8
-msgid "Backend"
+#: templates/settings.php:10
+msgid "External storage"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:11
msgid "Configuration"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:12
msgid "Options"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:13
msgid "Applicable"
msgstr ""
-#: templates/settings.php:23
-msgid "Add mount point"
+#: templates/settings.php:33
+msgid "Add storage"
msgstr ""
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:90
msgid "None set"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:91
msgid "All Users"
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:92
msgid "Groups"
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:100
msgid "Users"
msgstr ""
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:129
msgid "Enable User External Storage"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:141
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:113
+#: templates/settings.php:159
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index fcba73eea448e91f7d1af8092a945b1145b56cb1..ce314f8d2aa16ba120df0c46c5f0d20c7e6ac538 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9
+#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:11
+#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
msgid "Download"
msgstr ""
-#: templates/public.php:29
+#: templates/public.php:40
msgid "No preview available for"
msgstr ""
-#: templates/public.php:37
+#: templates/public.php:50
msgid "web services under your control"
msgstr ""
diff --git a/l10n/fi/files_trashbin.po b/l10n/fi/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..7cf44f62a8e927bbc842c9d7e4cd829aa274b373
--- /dev/null
+++ b/l10n/fi/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:175 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:184
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:196
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/fi/files_versions.po b/l10n/fi/files_versions.po
index 7317ba1f3e422757ff622b32b6aa05f7e5987a1a..12a72b999d1fb09fff7016c0e9e7db17604dab21 100644
--- a/l10n/fi/files_versions.po
+++ b/l10n/fi/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,41 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:16
-msgid "History"
+#: history.php:40
+msgid "success"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:69
+msgid "No old versions available"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: history.php:74
+msgid "No path specified"
msgstr ""
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:6
+msgid "Versions"
msgstr ""
-#: templates/settings.php:4
-msgid "Enable"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index 93a7b3b4ed57501e2938e5c26269302d35f38db0..34b8a345ccd924ace706c70002434717e4c86b54 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/lib.po
@@ -7,57 +7,57 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "asetukset"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 4be7031174a5d2f2d4beec7ed3833be22ee96775..1e9abc85b85032b91ec450bff29036b551225388 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,86 +17,163 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/creategroup.php:19
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:19
msgid "Unable to add group"
msgstr ""
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:11
msgid "Could not enable app. "
msgstr ""
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
msgid "Invalid email"
msgstr ""
-#: ajax/openid.php:16
-msgid "OpenID Changed"
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
msgstr ""
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
msgstr ""
-#: ajax/removegroup.php:16
-msgid "Unable to delete group"
+#: ajax/setlanguage.php:15
+msgid "Language changed"
msgstr ""
-#: ajax/removeuser.php:22
-msgid "Unable to delete user"
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
msgstr ""
-#: ajax/setlanguage.php:18
-msgid "Language changed"
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
msgstr ""
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
msgstr ""
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:28 js/apps.js:65
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
msgid "Disable"
msgstr ""
-#: js/apps.js:28 js/apps.js:54
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
msgstr ""
-#: js/personal.js:69
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:93
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:96
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: personal.php:47 personal.php:48
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:160
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:428
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:429 js/users.js:435 js/users.js:450
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:434
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
-#: templates/admin.php:14
+#: templates/admin.php:15
msgid "Security Warning"
msgstr ""
-#: templates/admin.php:17
+#: templates/admin.php:18
msgid ""
"Your data directory and your files are probably accessible from the "
"internet. The .htaccess file that ownCloud provides is not working. We "
@@ -105,71 +182,153 @@ msgid ""
" webserver document root."
msgstr ""
-#: templates/admin.php:31
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"This ownCloud server can't set system locale to %s. This means that there "
+"might be problems with certain characters in file names. We strongly suggest"
+" to install the required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This ownCloud server has no working internet connection. This means that "
+"some of the features like mounting of external storage, notifications about "
+"updates or installation of 3rd party apps don´t work. Accessing files from "
+"remote and sending of notification emails might also not work. We suggest to"
+" enable internet connection for this server if you want to have all features"
+" of ownCloud."
+msgstr ""
+
+#: templates/admin.php:92
msgid "Cron"
msgstr ""
-#: templates/admin.php:37
+#: templates/admin.php:101
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:43
+#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
msgstr ""
-#: templates/admin.php:49
+#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:128
msgid "Sharing"
msgstr ""
-#: templates/admin.php:61
+#: templates/admin.php:134
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:135
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:67
+#: templates/admin.php:142
msgid "Allow links"
msgstr ""
-#: templates/admin.php:68
+#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:73
+#: templates/admin.php:150
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:74
+#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:79
+#: templates/admin.php:158
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:81
+#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:88
+#: templates/admin.php:168
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:181
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:182
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:185
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:195
msgid "Log"
msgstr ""
-#: templates/admin.php:116
+#: templates/admin.php:196
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:227
msgid "More"
msgstr ""
-#: templates/admin.php:124
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -179,143 +338,159 @@ msgid ""
"License\">AGPL</abbr></a>."
msgstr ""
-#: templates/apps.php:10
+#: templates/apps.php:11
msgid "Add your App"
msgstr ""
-#: templates/apps.php:11
+#: templates/apps.php:12
msgid "More Apps"
msgstr ""
-#: templates/apps.php:27
+#: templates/apps.php:28
msgid "Select an App"
msgstr ""
-#: templates/apps.php:31
+#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
msgstr ""
-#: templates/apps.php:32
+#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/apps.php:38
+msgid "Update"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:23
-msgid "Problems connecting to help database."
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
msgstr ""
-#: templates/help.php:24
-msgid "Go there manually."
+#: templates/help.php:14
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:32
-msgid "Answer"
+#: templates/help.php:17
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
msgstr ""
-#: templates/personal.php:13
-msgid "Download"
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+msgid "Password"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:38
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:39
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:40
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:42
msgid "New password"
msgstr ""
-#: templates/personal.php:23
-msgid "show"
+#: templates/personal.php:44
+msgid "Change password"
msgstr ""
-#: templates/personal.php:24
-msgid "Change password"
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:68
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:70
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:71
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:77 templates/personal.php:78
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:94
+msgid "WebDAV"
msgstr ""
-#: templates/users.php:21 templates/users.php:76
-msgid "Name"
+#: templates/personal.php:96
+msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
+#: templates/users.php:21 templates/users.php:80
+msgid "Login Name"
msgstr ""
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
-msgid "Groups"
+#: templates/users.php:30
+msgid "Create"
msgstr ""
-#: templates/users.php:32
-msgid "Create"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
+msgid "Default Storage"
msgstr ""
-#: templates/users.php:35
-msgid "Default Quota"
+#: templates/users.php:44 templates/users.php:138
+msgid "Unlimited"
msgstr ""
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:80 templates/users.php:112
-msgid "Group Admin"
+#: templates/users.php:87
+msgid "Storage"
msgstr ""
-#: templates/users.php:82
-msgid "Quota"
+#: templates/users.php:98
+msgid "change display name"
msgstr ""
-#: templates/users.php:146
-msgid "Delete"
+#: templates/users.php:102
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:133
+msgid "Default"
msgstr ""
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
index 5f8865fafa71e6bfd43d9eb79dde9954dad8c265..cd2c388c98c4d73e97fc5fb5d0ba700854ac946d 100644
--- a/l10n/fi/user_ldap.po
+++ b/l10n/fi/user_ldap.po
@@ -7,164 +7,413 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:8
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:18
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:19
-msgid "Base Group Tree"
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
msgstr ""
-#: templates/settings.php:20
-msgid "Group-Member association"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
-msgid "Do not use it for SSL connections, it will fail."
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/fi/user_webdavauth.po b/l10n/fi/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..9f3a7c03ab943b6d37fd46e50f3884e17001045a
--- /dev/null
+++ b/l10n/fi/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 36d65066e3db4d71531154861faf56cd700ee122..9ebc3e72d7203d305378178773d3dc0aef723e11 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -213,26 +213,30 @@ msgstr "viime vuonna"
msgid "years ago"
msgstr "vuotta sitten"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Valitse"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Peru"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Valitse"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -406,7 +410,7 @@ msgstr ""
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
@@ -561,12 +565,12 @@ msgstr "Viimeistele asennus"
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Kirjaudu ulos"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 8ef0a08d519b84f4921e89878883bbcb54ceb165..c797fa053dce19cf1f96fed5f4ac6dfcb603604c 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 8e9d79de1f6261c991d56f22c2c0a5e7d962c8e9..df1e78980c08532cdbdbdbd452f1120956a980b5 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Salasana vaihdettiin onnistuneesti."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Tallennetaan..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Salaus"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Tiedostojen salaus on käytössä."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Ei käytössä"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Vaihda salasana"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Seuraavia tiedostotyyppejä ei salata:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Älä salaa seuravia tiedostotyyppejä:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ei mitään"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 5063d7091103b312ea37d47e63b7fd670e344e6c..799f6ad90bd291fd12456f25ee0eaf0668df7a37 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index dedda4f4352652c6572f03b23e4198f64eb78d07..5e32d3b535dd16912c9197a8dbf738b7a8f55335 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index c076a783a1826215aefe48e9816aee38a0c6239d..67e93e12bacf662aa856c554fd4f419b8cd8fcc8 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
msgid "Couldn't restore %s"
msgstr "Kohteen %s palautus epäonnistui"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "suorita palautustoiminto"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Virhe"
@@ -39,31 +39,31 @@ msgstr "Virhe"
msgid "delete file permanently"
msgstr "poista tiedosto pysyvästi"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Poista pysyvästi"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nimi"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Poistettu"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 kansio"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} kansiota"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 tiedosto"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} tiedostoa"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index f29c46f4570b41299d9299b017ad17c609a86087..c93ead204dc95bb7344382ee8cd850002822ae38 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 4a438cdbf2e71c639b7b7792b6a54c894dbfed27..b9daa415a2a58fc8f568bdbb688439e1411dd0d8 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ohje"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Henkilökohtainen"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Asetukset"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Käyttäjät"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Sovellukset"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Ylläpitäjä"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP-lataus on poistettu käytöstä."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Tiedostot on ladattava yksittäin."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Takaisin tiedostoihin"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "ei voitu määrittää"
@@ -113,72 +114,76 @@ msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Oracle-yhteyttä ei voitu muodostaa"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Tietokantavirhe: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Pudota tämä käyttäjä MySQL:stä"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Pudota tämä käyttäjä MySQL:stä."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 75d1540673fa8f677dc13deef7886b758f5d0555..ae577b6479ba285afdcfb5da29ced0dd31fdd50b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +125,44 @@ msgstr "Päivitetty"
msgid "Saving..."
msgstr "Tallennetaan..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "poistettu"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "kumoa"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Poista"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "lisää ryhmä"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Virhe käyttäjää luotaessa"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -325,11 +325,11 @@ msgstr "Enemmän"
msgid "Less"
msgstr "Vähemmän"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Salasana"
@@ -424,39 +424,39 @@ msgstr "Uusi salasana"
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Näyttönimi"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Sähköpostiosoite"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Sähköpostiosoitteesi"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Kieli"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Kirjautumisnimi"
@@ -464,30 +464,34 @@ msgstr "Kirjautumisnimi"
msgid "Create"
msgstr "Luo"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Oletustallennustila"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Rajoittamaton"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Muu"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Tallennustila"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "vaihda näyttönimi"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "aseta uusi salasana"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 8cad6d46a11939c177a5f4037371e428ed84c8e7..8dc1297ab7f53f78fb7c5995eb0d160440ce387c 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr "Säilytetäänkö asetukset?"
msgid "Cannot add server configuration"
msgstr "Palvelinasetusten lisäys epäonnistui"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Onnistui!"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Virhe"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Yhteystesti onnistui"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Yhteystesti epäonnistui"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Vahvista poisto"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Isäntä"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Oletus DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä "
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Käyttäjän DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Salasana"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Login suodatus"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Käyttäjien suodatus"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan. "
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Ryhmien suodatus"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. "
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Yhteysasetukset"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Portti"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Poista pääpalvelin käytöstä"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Käytä TLS:ää"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Poista käytöstä SSL-varmenteen vahvistus"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ei suositella, käytä vain testausta varten."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekunneissa. Muutos tyhjentää välimuistin."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Hakemistoasetukset"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Käyttäjän näytettävän nimen kenttä"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä "
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Oletuskäyttäjäpuu"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Ryhmien juuri"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "tavuissa"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Sähköpostikenttä"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ohje"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index ef62c35b8a06671b574185cb80fd88aaf2367f6f..03611071936b7c233bc450c402e0d7dac0f90abe 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b88d8fd8508bc236a104fa3c48046e5488d6d53e..4f2b687146945fdd527399d31828ef9a7ae917d9 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-10 01:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: msoko <sokolovitch@yahoo.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "l'année dernière"
msgid "years ago"
msgstr "il y a plusieurs années"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Choisir"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annuler"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Choisir"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -562,12 +566,12 @@ msgstr "Terminer l'installation"
msgid "web services under your control"
msgstr "services web sous votre contrôle"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Se déconnecter"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index bec531ce06b57cffbd9f8009c88f4acbf38688af..a092018dce0c56c8b77210f6d907cc01daf7190d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
# MathieuP <mathieu.payrol@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -218,7 +219,7 @@ msgstr "{count} fichiers"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index a39633b4513c2e8bc0d0aa9a4c21ad6c1590bb2a..e5b30416823b4b8a50baf16b8c105df5673178d4 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Enregistrement..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Chiffrement"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Le chiffrement des fichiers est activé"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Les fichiers de types suivants ne seront pas chiffrés :"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants :"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Aucun"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 1038a04378c152798e3817d90a8aa79fa5da9e8e..b7dc04db5642341b9a0a4dd729bc22e49d8ad254 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index d1da943c7c249491894e9a8de73caba0564cc3b0..f8171e53ba13b02458886a6fd0e8b6a17a43690f 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index eaa5def5c6bc28a07b6864a0526a2ee60062b11d..cf2e6250af81d82315eefa08c541950ef0d030e7 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Impossible d'effacer %s de façon permanente"
msgid "Couldn't restore %s"
msgstr "Impossible de restaurer %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "effectuer l'opération de restauration"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Erreur"
@@ -39,31 +39,31 @@ msgstr "Erreur"
msgid "delete file permanently"
msgstr "effacer définitivement le fichier"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Supprimer de façon définitive"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Effacé"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 dossier"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} dossiers"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fichier"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} fichiers"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 9dd1fa7ce3f0a7b8d54371ce652c72eddc192c5c..dd91318cfb4c79af70b3dc306e50f1edfb1f1c46 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 6443c8f3bd9e2d4e038dc1d5fb1901430d449c89..db6584de9ad50217722f4a4991d3838ee6ef3462 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyril Glapa <kyriog@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Cyril Glapa <kyriog@gmail.com>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Aide"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personnel"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Paramètres"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utilisateurs"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applications"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administration"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Téléchargement ZIP désactivé."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Les fichiers nécessitent d'être téléchargés un par un."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Retour aux Fichiers"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "impossible à déterminer"
@@ -113,72 +114,76 @@ msgstr "%s vous nez pouvez pas utiliser de points dans le nom de la base de donn
msgid "%s set the database host."
msgstr "%s spécifiez l'hôte de la base de données."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "La connexion Oracle ne peut pas être établie"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erreur de la base de données : \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "La requête en cause est : \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Retirer cet utilisateur de la base MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Retirer cet utilisateur de la base MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index dbd916ae194c3b11615238531fad829eda89d2f7..809d6777e2996037e7984512743240c1ad012988 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -125,44 +125,44 @@ msgstr "Mise à jour effectuée avec succès"
msgid "Saving..."
msgstr "Enregistrement..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "supprimé"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "annuler"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Supprimer"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "ajouter un groupe"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Un nom d'utilisateur valide doit être saisi"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Erreur lors de la création de l'utilisateur"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
@@ -325,11 +325,11 @@ msgstr "Plus"
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Obtenez les applications de synchronisation de vos fichiers"
msgid "Show First Run Wizard again"
msgstr "Revoir le premier lancement de l'installeur"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Mot de passe"
@@ -424,39 +424,39 @@ msgstr "Nouveau mot de passe"
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nom affiché"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Adresse mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Votre adresse e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Langue"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nom de la connexion"
@@ -464,30 +464,34 @@ msgstr "Nom de la connexion"
msgid "Create"
msgstr "Créer"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Support de stockage par défaut"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Illimité"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Autre"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Support de stockage"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Changer le nom affiché"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Changer le mot de passe"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 26cf3a1a6d9f559c0e0365e3551344b16576e6d4..413aa4f723433d18de17dcb7d9ce8ab07e87c78a 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# plachance <patlachance@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: plachance <patlachance@gmail.com>\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"
@@ -17,6 +18,10 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Erreur lors de la suppression des associations."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Échec de la suppression de la configuration du serveur"
@@ -51,283 +56,365 @@ msgstr "Garder ces paramètres ?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr "Impossible d'ajouter la configuration du serveur."
+msgstr "Impossible d'ajouter la configuration du serveur"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "associations supprimées"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succès"
-#: js/settings.js:121
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erreur"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test de connexion réussi"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
-msgstr "Le test de connexion a échoué"
+msgstr "Test de connexion échoué"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmer la suppression"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuration du serveur"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Ajouter une configuration du serveur"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Hôte"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
-msgstr "DN Racine"
+msgstr "DN racine"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN racine par ligne"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Mot de passe"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
+msgstr "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Modèle d'authentification utilisateurs"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtre d'utilisateurs"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtre de groupes"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Paramètres de connexion"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuration active"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Lorsque non cochée, la configuration sera ignorée."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Serveur de backup (réplique)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Port du serveur de backup (réplique)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Désactiver le serveur principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Utiliser TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Serveur LDAP insensible à la casse (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Désactiver la validation du certificat SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Non recommandé, utilisation pour tests uniquement."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Durée de vie du cache"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en secondes. Tout changement vide le cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Paramètres du répertoire"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Champ \"nom d'affichage\" de l'utilisateur"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "DN racine de l'arbre utilisateurs"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN racine utilisateur par ligne"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Recherche des attributs utilisateur"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optionnel, un attribut par ligne"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Champ \"nom d'affichage\" du groupe"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "DN racine de l'arbre groupes"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN racine groupe par ligne"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Recherche des attributs du groupe"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Association groupe-membre"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Attributs spéciaux"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Champ du quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota par défaut"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
-msgstr "en octets"
+msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Champ Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Convention de nommage du répertoire utilisateur"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laisser vide "
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nom d'utilisateur interne"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Nom d'utilisateur interne:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Surcharger la détection d'UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Attribut UUID :"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Supprimer l'association nom de groupe-groupe LDAP"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Tester la configuration"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Aide"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 8fdd18d7e53866804251f80225d2c77e2ee5343a..d1834912d730d8a5f223c60f1cebffaf418525f5 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013.
-# <mishka.lazzlo@gmail.com>, 2013.
-# <nicolas@shivaserv.fr>, 2012.
-# Robert Di Rosa <>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2013
+# mishka <mishka.lazzlo@gmail.com>, 2013
+# ouafnico <nicolas@shivaserv.fr>, 2012
+# Robert Di Rosa <>, 2012
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 40d9a6e9cef1e92361266f0967d957787fe76a11..2e363e38a494d1ea65f6a1abfe13b142ddf8d01d 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 06:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escoller"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escoller"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Aceptar"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Rematar a configuración"
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Desconectar"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 0c0309bfa6eb3a3ac997eb9ca8be93cc0831f809..0ee9089b6a52b7623647da4f54586d7d87d3d6fa 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -218,7 +218,7 @@ msgstr "{count} ficheiros"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index deed371c809c60c8716b9602534f2c38d9d0af01..df19cbea75f00ba055cca9e96493acaa345c4a92 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 06:50+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +20,87 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Activada satisfactoriamente a chave de recuperación"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Desactivada satisfactoriamente a chave de recuperación"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "O contrasinal foi cambiado satisfactoriamente"
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gardando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "O cifrado de ficheiros está activado"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Activar a chave de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Recuperación do contrasinal da conta"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Activado"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Cambiar a chave de la recuperación do cifrado de contrasinais:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Antigo contrasinal de recuperación da conta"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Novo contrasinal de recuperación da conta"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Cambiar o contrasinal"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes tipos de ficheiros non van seren cifrados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluír os seguintes tipos de ficheiros do cifrado:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Actualizouse o ficheiro de axustes de recuperación"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ningún"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Non foi posíbel actualizar o ficheiro de recuperación"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index d0b6177856dd7d6c28bfbc6d9780ed18ee028145..11e70ec65498df351a2f1a536deca92bedd90622 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index e9c4c07adc98ec0cb46c3c7da328b99977cc7535..a65f3b54e49a3b304e735895f7570e1ef50ee0b6 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 5f9f69c52689055e89dbc36dde0e71e755a0ea28..2c02309e78e0da9cffdd78fcfafb8577a02922d7 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Non foi posíbel eliminar %s permanente"
msgid "Couldn't restore %s"
msgstr "Non foi posíbel restaurar %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "realizar a operación de restauración"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Erro"
@@ -39,31 +39,31 @@ msgstr "Erro"
msgid "delete file permanently"
msgstr "eliminar o ficheiro permanentemente"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 cartafol"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} cartafoles"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ficheiro"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ficheiros"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index b7440fc633f37e93d5359926a0d2ec6add43b309..be763534a5e07997e2f4ee918adbb45ac550c79f 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index f5375905736eb368186ecb94c4ca9bbf8dc5cc0c..941229a6b88725f95d8b2c4aac55cf296c364913 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Axuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persoal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Axustes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuarios"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicativos"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administración"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "As descargas ZIP están desactivadas."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros necesitan seren descargados dun en un."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Volver aos ficheiros"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "non foi posíbel determinalo"
@@ -113,72 +114,76 @@ msgstr "%s non se poden empregar puntos na base de datos"
msgid "%s set the database host."
msgstr "%s estabeleza o servidor da base de datos"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Deberá introducir unha conta existente ou o administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Non foi posíbel estabelecer a conexión con Oracle"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Produciuse un erro na base de datos: «%s»"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "A orde ofensiva foi: «%s»"
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O usuario MySQL '%s'@'localhost' xa existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Omitir este usuario de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "O usuario MySQL «%s»@«%%» xa existe."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Omitir este usuario de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 84a80b69d571d809f2bb35c96a39f8032ab5d95b..c20ca89cf7f6e659b9d4b6cba422282ebc7f6677 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-11 20:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -137,16 +137,16 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Non é posíbel retirar o usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eliminar"
@@ -154,15 +154,15 @@ msgstr "Eliminar"
msgid "add group"
msgstr "engadir un grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Debe fornecer un nome de usuario"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Produciuse un erro ao crear o usuario"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Debe fornecer un contrasinal"
@@ -325,11 +325,11 @@ msgstr "Máis"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
msgid "Show First Run Wizard again"
msgstr "Amosar o axudante da primeira execución outra vez"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contrasinal"
@@ -424,39 +424,39 @@ msgstr "Novo contrasinal"
msgid "Change password"
msgstr "Cambiar o contrasinal"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Amosar o nome"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Correo"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "O seu enderezo de correo"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome de acceso"
@@ -464,30 +464,34 @@ msgstr "Nome de acceso"
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperación do contrasinal do administrador"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Almacenamento predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Sen límites"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Almacenamento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "cambiar o nome visíbel"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "estabelecer un novo contrasinal"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 37a1e107ae4e70019a78c1839981fd7265a44a04..9a807cb786863768d667888fbeac56062e776b19 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Non foi posíbel limpar as asignacións."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Non foi posíbel eliminar a configuración do servidor"
@@ -53,281 +58,363 @@ msgstr "Manter os axustes?"
msgid "Cannot add server configuration"
msgstr "Non é posíbel engadir a configuración do servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "limpadas as asignacións"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Correcto"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "A proba de conexión foi satisfactoria"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "A proba de conexión fracasou"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Confirma que quere eliminar a configuración actual do servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar a eliminación"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuración do servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Engadir a configuración do servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN base por liña"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN do usuario"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contrasinal"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de acceso de usuarios"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro da lista de usuarios"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar cando se recompilan os grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Axustes da conexión"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuración activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Se está sen marcar, omítese esta configuración."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Servidor da copia de seguranza (Réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porto da copia de seguranza (Réplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desactivar o servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desactiva a validación do certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Non se recomenda. Só para probas."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Tempo de persistencia da caché"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Calquera cambio baleira a caché."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Axustes do directorio"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo de mostra do nome de usuario"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base da árbore de usuarios"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN base de usuario por liña"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de busca do usuario"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por liña"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo de mostra do nome de grupo"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base da árbore de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN base de grupo por liña"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de busca do grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociación de grupos e membros"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo de cota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cota predeterminada"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo do correo"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regra de nomeado do cartafol do usuario"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome de usuario interno"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo do nome de usuario interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Ignorar a detección do UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo do UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Asignación do usuario ao «nome de usuario LDAP»"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Probar a configuración"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Axuda"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 89f599a0be8b8cbad0eb4dfcaab07720a9b7524b..779cbf82bae6b5b4309115a0dac7f0ec1116729b 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <mbouzada@gmail.com>, 2013.
-# <mbouzada@gmail.com>, 2012.
-# Miguel Branco, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013.
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2012
+# Miguel Branco, 2012
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index e37d0c016b4c907f94f3ad13cf8017249a6c2c4f..a7cdb7b902dfc3854a3cdd05dced40ac80a963df 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 09:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "שנה שעברה"
msgid "years ago"
msgstr "שנים"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "בסדר"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "בחירה"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ביטול"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "בחירה"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "לא"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "בסדר"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "סיום התקנה"
msgid "web services under your control"
msgstr "שירותי רשת תחת השליטה שלך"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "התנתקות"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 1082f58adcbf8682970909c819cf513539979303..1fdea3414068f912d00dab8a6ebf25e46cd7b823 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 2d25899318b7bdd923f118913d33a33506618999..d2120666022fa83e4b6e2403dbbe2c388633515a 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "שמירה…"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "הצפנה"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "כלום"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index c0c781c9cda848ff767434571b6350aa4a85ad4d..3b0478cada5203e3696484aab3c01a084897bf83 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index a457a7f6147f2560002a49251b61b209e6f0201d..5428e9f8756e6eba5430010cc9028c77c08ed9ce 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index c5e7737bb82a94e14c65151b9157eb4550ab2252..fd7ab0c664957b617eb2378018db805b03a4ef8e 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "בלתי אפשרי למחוק את %s לצמיתות"
msgid "Couldn't restore %s"
msgstr "בלתי אפשרי לשחזר את %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "בצע פעולת שחזור"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "שגיאה"
@@ -39,31 +39,31 @@ msgstr "שגיאה"
msgid "delete file permanently"
msgstr "מחק קובץ לצמיתות"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "מחק לצמיתות"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "שם"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "נמחק"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "תיקייה אחת"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} תיקיות"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "קובץ אחד"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} קבצים"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index e39843a6d4a3f8b3a2f45976654d3b111535b17f..b6e191d2379942510285f611ee43e60130456d83 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index d6112754714499d593c62caacb8d5f4f6fb9a0a6..864047c853bc2ba2ef287f0862e6c1f859c3451b 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "עזרה"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "אישי"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "הגדרות"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "משתמשים"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "יישומים"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "מנהל"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "הורדת ZIP כבויה"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "יש להוריד את הקבצים אחד אחרי השני."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "חזרה לקבצים"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index ce9cabd5bccad793fadc0fe3e089469b04b1665d..3022e30dc04d97ba9c25dec1a771e94f96d0200d 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "שמירה…"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "ביטול"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "קבוצות"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "מנהל הקבוצה"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "מחיקה"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "יותר"
msgid "Less"
msgstr "פחות"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "גרסא"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "השג את האפליקציות על מנת לסנכרן את הקבצ
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "סיסמא"
@@ -423,39 +423,39 @@ msgstr "ססמה חדשה"
msgid "Change password"
msgstr "שינוי ססמה"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "דואר אלקטרוני"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "כתובת הדוא״ל שלך"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "פה"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "עזרה בתרגום"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "יצירה"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "אחר"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index dea5250c455c0fe9c1abd8d5a97ec8f37b504462..c13ba23bce584363d1e1bbcdc74631242fe0f678 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 13:50+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -54,281 +58,363 @@ msgstr "האם לשמור את ההגדרות?"
msgid "Cannot add server configuration"
msgstr "לא ניתן להוסיף את הגדרות השרת"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "שגיאה"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "בדיקת החיבור עברה בהצלחה"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "בדיקת החיבור נכשלה"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "האם אכן למחוק את הגדרות השרת הנוכחיות?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "אישור המחיקה"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "הגדרות השרת"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "הוספת הגדרות השרת"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "מארח"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN משתמש"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "סיסמא"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "לגישה אנונימית, השאר את הDM והסיסמא ריקים."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "סנן כניסת משתמש"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "סנן רשימת משתמשים"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "סנן קבוצה"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "פורט"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "בשניות. שינוי מרוקן את המטמון."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "בבתים"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "עזרה"
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index a1956eff5da94a6bba096d041153ca8e974e04d3..43d52925cb34a8ca1d0f5ade8032549db70e5f02 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 09e45c10d5e7bd477171af1cafa11e5233f2d294..735dee9d9cb619cee95160519cec23f997b47528 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-01 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "सेटअप समाप्त करे"
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "लोग आउट"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 9474cdb73f6e233d2ed3f6a6f6f8212616a9da84..4fbd84f19965309069a6cd6dd067e588cc20edf5 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 1c0263d2b386d4d3460cc8dbe31a2aba68092027..1b6ebe3c0011efdfd09ab047fcf50ca349696af8 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index befaf1f2c96f0e0e7d8595015db9b0cf22658b46..d437731724ffd6e87e8f30f0600e050c42d6df16 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index d56df17b305b104158d7791e39701204e3f076e9..5a9ccbc09ed3e65099c29dca598aea4315f0a1d3 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index ad93e8681d2df7ba12b2e9a30aa3284dcb54aa6f..6c057b0c2402e715a3f58e6917d2f31aae8a6a3b 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 66568383a703e33d68b89a0f700229c04ca96ba5..e3697cd4513dd004f6dc0db1f76dbddbcb41030e 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index bee0b2803db21c49b0e753fa3fed5318df6b71d6..fa9881916457ae30d7802661a4665defb1421a8d 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "सहयोग"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "यक्तिगत"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "सेटिंग्स"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "उपयोगकर्ता"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index b8210ac04b7f087ad1ca082ed50a65babae75a4e..c81fb256e3b3a4c45de1eb1ba97b3cff0a244857 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "पासवर्ड"
@@ -423,7 +423,7 @@ msgstr "नया पासवर्ड"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 68d753a4e27bcc3dc4ae3219d86c8f8100d78fa2..2bcde19cb2951cfe25c183b47370135a165fb515 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "पासवर्ड"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "सहयोग"
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index c6cb2a241350ad54a39c2b65814dc4d38e20f0c4..712626e49c00d2cf6fc0f413d0e5dbf3083e65f9 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 5ad69e813e1922e0192485871d45cbc4a48203cf..55e918788a602a2ebb8a0ed31a153f8665c562c1 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "prošlu godinu"
msgid "years ago"
msgstr "godina"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "U redu"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Izaberi"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Odustani"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Izaberi"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "U redu"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Završi postavljanje"
msgid "web services under your control"
msgstr "web usluge pod vašom kontrolom"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 834f399695c64312ebb22e46d40c95896d0d1d55..972d46958a1636bb5772a03d597b11d8e6ea6909 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index ba59607422cf2775acd65f5bbfe7a9281e44efa6..bbff99c9b09dee8f767809a810488a7001b8159d 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Spremanje..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 2e386aed7b1910929083206eded922a6722b90f0..6d9da77d95c67bc31b4486a319ff656badaa8d88 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 7e51b0c2de4368514374617358aa9e17a3cb8f6a..e6b5a7e3756f6fdd52c548c41333cda10d51b1b1 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 991690ed18340671525752b1b3f1e52b549067d2..533e3e43ed2fde4c1673ea2a3c801273d9a7305c 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Greška"
@@ -39,31 +39,31 @@ msgstr "Greška"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 6004430d182aed8b38124e07449fa66d8edd1210..4a55674bbd9ead0a18689f4335a0c1497a627fd7 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 4004b99b0ee0f9fa28e1ef6e99cd2e057ac6b6e1..ad1192b736e6d7e9100794e455518739fa828924 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoć"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobno"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Postavke"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Korisnici"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikacije"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrator"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 6bc11873716864decd8ca102f6f0465843c68e90..0aa248f1b26ea74a947633e60b7adcf939d1e088 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Spremanje..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "izbrisano"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "vrati"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupa Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Obriši"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "više"
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lozinka"
@@ -423,39 +423,39 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "e-mail adresa"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Vaša e-mail adresa"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Izradi"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "ostali"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 7cec467c48abddbdec4a2a6cfd4e3a475fddf5ba..450e358e9f41ba499165d4817902b459d9bfbf70 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Greška"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lozinka"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoć"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index c9f410b1ad0aba78e7ae282ed440a954a052c9d8..bc4382e068d2a2e4902dd952ddfac80118348c2d 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1ce61dc98c82548445f881b98a5c4da191255510..b70fc5e11252d688397385613d90684ed0444930 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "tavaly"
msgid "years ago"
msgstr "több éve"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Válasszon"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Mégsem"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Válasszon"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Nem sikerült betölteni a fájlkiválasztó sablont"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nem"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "A beállítások befejezése"
msgid "web services under your control"
msgstr "webszolgáltatások saját kézben"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s rendelkezésre áll. További információ a frissítéshez."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Kilépés"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index e619f8ec6f9514f29f63ca8fb65775d1164a386f..ac39b2cd630e3fa0b2aa0a695fc91b0876caf531 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
@@ -217,7 +218,7 @@ msgstr "{count} fájl"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 319463b63866d41f18812885987c02bf2426a846..643b0404816a55811ce9a01a9c9f5d2ece8d3470 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Mentés..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Titkosítás"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Az állományok titkosítása be van kapcsolva."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "A következő fájltípusok nem kerülnek titkosításra:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Zárjuk ki a titkosításból a következő fájltípusokat:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Egyik sem"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index f040dbabdc8af6689f89b49b89e968966f0d27aa..bc36606bcabb8b220f7877cc68b129279a5e07d2 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index c2a6ad60a756ad99471624878d16c7eafb0938ef..66718ac0b98a1476b8054f26f8acf77e9ad21896 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index a9a5961b1792876a63fc7139126c46c0fcf53d05..aa6a6bb38b425670006654a00a3f12d3347b5255 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Nem sikerült %s végleges törlése"
msgid "Couldn't restore %s"
msgstr "Nem sikerült %s visszaállítása"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "a visszaállítás végrehajtása"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Hiba"
@@ -39,31 +39,31 @@ msgstr "Hiba"
msgid "delete file permanently"
msgstr "az állomány végleges törlése"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Név"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Törölve"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mappa"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mappa"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fájl"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} fájl"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index c10a67b3b874cfeec54e8ddc08843196b7a8984d..39f58c0a5db318e40a101cdbac1166893fd5bb7c 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 9b4f3529f8e9b555a1ef68057e29ffd7c794e11e..dc3f7965f27a4aabee25d7c628b436ab04d537ed 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Súgó"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Személyes"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Beállítások"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Felhasználók"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Alkalmazások"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Adminsztráció"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "A ZIP-letöltés nincs engedélyezve."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "A fájlokat egyenként kell letölteni."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Vissza a Fájlokhoz"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nem határozható meg"
@@ -113,72 +114,76 @@ msgstr "%s az adatbázis neve nem tartalmazhat pontot"
msgid "%s set the database host."
msgstr "%s adja meg az adatbázist szolgáltató számítógép nevét."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Az Oracle kapcsolat nem hozható létre"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Adatbázis hiba: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "A hibát ez a parancs okozta: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Törölje ezt a felhasználót a MySQL-ből"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Törölje ezt a felhasználót a MySQL-ből."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index d341340b804f004d296c6478a6add0f1d716c72e..3eae903f150757f0c5cfcd6b35cd34bdf9a330ea 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 16:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Frissítve"
msgid "Saving..."
msgstr "Mentés..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "törölve"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "visszavonás"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolítáni"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Törlés"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "csoport hozzáadása"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Érvényes felhasználónevet kell megadnia"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "A felhasználó nem hozható létre"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
@@ -325,11 +325,11 @@ msgstr "Több"
msgid "Less"
msgstr "Kevesebb"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Verzió"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Töltse le az állományok szinkronizációjához szükséges programoka
msgid "Show First Run Wizard again"
msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Jelszó"
@@ -424,39 +424,39 @@ msgstr "Az új jelszó"
msgid "Change password"
msgstr "A jelszó megváltoztatása"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "A megjelenített név"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Az Ön email címe"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Nyelv"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Segítsen a fordításban!"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Bejelentkezési név"
@@ -464,30 +464,34 @@ msgstr "Bejelentkezési név"
msgid "Create"
msgstr "Létrehozás"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "A jelszóvisszaállítás adminisztrációja"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Alapértelmezett tárhely"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Korlátlan"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Más"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Tárhely"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "a megjelenített név módosítása"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "új jelszó beállítása"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 55f3c268735ce9e206f3717a0e6accd81f4f524a..7cdac13a90d2dea5485c2a3b30b3db4dbf44272c 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
@@ -17,6 +18,10 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Nem sikerült törölni a hozzárendeléseket."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Nem sikerült törölni a kiszolgáló konfigurációját"
@@ -53,281 +58,363 @@ msgstr "Tartsuk meg a beállításokat?"
msgid "Cannot add server configuration"
msgstr "Az új kiszolgáló konfigurációja nem hozható létre"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Töröltük a hozzárendeléseket"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sikeres végrehajtás"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Hiba"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "A kapcsolatellenőrzés eredménye: sikerült"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "A kapcsolatellenőrzés eredménye: nem sikerült"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Tényleg törölni szeretné a kiszolgáló beállításait?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "A törlés megerősítése"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "A kiszolgálók beállításai"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Új kiszolgáló beállításának hozzáadása"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Kiszolgáló"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN-gyökér"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Soronként egy DN-gyökér"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "A kapcsolódó felhasználó DN-je"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Jelszó"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Szűrő a bejelentkezéshez"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "A felhasználók szűrője"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Ez a szűrő érvényes a felhasználók listázásakor."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "A csoportok szűrője"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Ez a szűrő érvényes a csoportok listázásakor."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Kapcsolati beállítások"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "A beállítás aktív"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ha nincs kipipálva, ez a beállítás kihagyódik."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Másodkiszolgáló (replika)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "A másodkiszolgáló (replika) portszáma"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "A fő szerver kihagyása"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Ha ezt bekapcsoljuk, akkor az ownCloud csak a másodszerverekhez kapcsolódik."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Használjunk TLS-t"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát az ownCloud kiszolgálóra!"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nem javasolt, csak tesztelésre érdemes használni."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "A gyorsítótár tárolási időtartama"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "másodpercben. A változtatás törli a cache tartalmát."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Címtár beállítások"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "A felhasználónév mezője"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Ebből az LDAP attribútumból képződik a felhasználó elnevezése, ami megjelenik az ownCloudban."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "A felhasználói fa gyökere"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "A felhasználók lekérdezett attribútumai"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Nem kötelező megadni, soronként egy attribútum"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "A csoport nevének mezője"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Ebből az LDAP attribútumból képződik a csoport elnevezése, ami megjelenik az ownCloudban."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "A csoportfa gyökere"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "A csoportok lekérdezett attribútumai"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "A csoporttagság attribútuma"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Különleges attribútumok"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kvóta mező"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Alapértelmezett kvóta"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "bájtban"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Email mező"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "A home könyvtár elérési útvonala"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Belső felhasználónév"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "A belső felhasználónév attribútuma:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Az UUID-felismerés felülbírálása"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID attribútum:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "A csoport - LDAP csoport hozzárendelés törlése"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "A beállítások tesztelése"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Súgó"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 535e53af3312800d8a67ebb2273aea125f1ee87d..e2056a92cafd5c64f9755143b6903ccc71cf746d 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Akos <nagy.akos@libreoffice.ro>, 2013.
+# akoscomp <nagy.akos@libreoffice.ro>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f393e4f5a2b20c14f881724efef01e5258cf7ad5..e738115c1e43b4714c6813bdda144cc03e517bdd 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 52f66f4a8d31bf85dedc8918ad824c915e4ae74a..eb1ce560470a0db368446ccf86caa562af759042 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 00b039ad399c5eaf5dd486c1df8f5be957b6318c..a16e27d574b2426a99de18a5d3ee53f55d8e4a81 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,28 +7,97 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index a6e391b464839829a31ed9b1ea8d087b1a0a76a2..fb45b44723a0bbcc392afde909a7a2802b45edfa 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 22d56339abe874d73dd1efa01b4e5c257196f3aa..a784afbf6b3321b99f1c6c3e1aa5519023341179 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index 57d556aab188f72ad0319c2e7651bc3505eb6c23..74dcd02188eef30788a0ba91b53a1523abd94de0 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr ""
@@ -39,31 +39,31 @@ msgstr ""
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
index 4caf1f1827149828dfd5894450265a0ca905dbd9..7e959a096a38c80a81b2db21cd4890ab1fbac83d 100644
--- a/l10n/hy/files_versions.po
+++ b/l10n/hy/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,41 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:16
-msgid "History"
+#: history.php:40
+msgid "success"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:69
+msgid "No old versions available"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: history.php:74
+msgid "No path specified"
msgstr ""
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:6
+msgid "Versions"
msgstr ""
-#: templates/settings.php:4
-msgid "Enable"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index a6359330b340cf390a2b6652c37be07d9fabed51..a40365032ad76706041240c55d5b192dea0346b0 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,61 +7,65 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:295
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:300
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:305
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:312
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:314
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:280
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:281
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:281 files.php:306
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:305
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:63 json.php:75
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -69,57 +73,173 @@ msgstr ""
msgid "Token expired. Please reload page."
msgstr ""
-#: template.php:86
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup.php:34
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:37
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:55
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup.php:58
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup.php:61
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup.php:64
+#, php-format
+msgid "%s set the database host."
+msgstr ""
+
+#: setup.php:132 setup.php:329 setup.php:374
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:238
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:237
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:309
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:314
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:315
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:644
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:867
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:868
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:87
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:88
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:91
+#: template.php:116
+msgid "1 hour ago"
+msgstr ""
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr ""
+
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:92
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:93
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:94
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:95
-msgid "months ago"
+#: template.php:122
+#, php-format
+msgid "%d months ago"
msgstr ""
-#: template.php:96
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:97
+#: template.php:124
msgid "years ago"
msgstr ""
-#: updater.php:66
+#: vcategories.php:188 vcategories.php:249
#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:68
-msgid "up to date"
-msgstr ""
-
-#: updater.php:71
-msgid "updates check is disabled"
+msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 0ce7e26c45783c99a1831762a66c7d01634f29c6..2c73b731876a81b6c75e58cecd06a098d12d261c 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Ջնջել"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,39 +423,39 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr ""
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Այլ"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 438a2108b76873cf9c642095ab8dd9b49d3eb9ab..b85c44b15c33bbbef6e7cee629bd2a9a3b960ad7 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,164 +7,413 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:8
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:18
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:19
-msgid "Base Group Tree"
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
msgstr ""
-#: templates/settings.php:20
-msgid "Group-Member association"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
-msgid "Do not use it for SSL connections, it will fail."
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..101ab76c34c2176353c5a8be5146ac2720bde3ea
--- /dev/null
+++ b/l10n/hy/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 1b1eef6e69a85daa3f3916e4b6051acabe124420..12ac2f61376c33efa08994b976cdd99f356a2b90 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:58+0200\n"
-"PO-Revision-Date: 2013-05-03 13:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancellar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr "servicios web sub tu controlo"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Clauder le session"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 94c9b971fa6b10831ad7343eccee51d0ce644ac9..f95c026aa11b66e8dabb429f9b630562dcb49ced 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 542eba1d2eb6cd495207eeab58e5a4cca402402f..37c50e27483802edd10801e53d22e4bd2596e454 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index bebf028aa871aa5d033af17236cc1397f05f746c..4971a7cae94d67aecb6c0ee4e5b05d8fa12616d0 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 0234ab82aa4e6ea3e155391322a113c919741255..19200562667e598f74a6fe465f8c4ea360821d1d 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 19c5329f297e09fa9d23a4da15a5af84ea8688c8..6712fe19cae3f17fd157ad0f183dfc5a70719ecb 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:58+0200\n"
-"PO-Revision-Date: 2013-05-03 13:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Error"
@@ -39,31 +39,31 @@ msgstr "Error"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nomine"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 7c02d48b46e0b4351600116eff772046ccb41bc8..0e666b6dc57525ae7e5c92f376f35aa799229dda 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 304647c370fefabd8caeaf46371772854b206b40..6f3e874e137f56651b53c6df932619b96b390d00 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Adjuta"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configurationes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usatores"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applicationes"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administration"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 76a8123d801ca17492c0d25ebd4a790766e57d9f..e8e884bc8c6f895927d11f3d4a4bdd06608f118d 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:59+0200\n"
-"PO-Revision-Date: 2013-05-03 13:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Deler"
@@ -153,19 +153,19 @@ msgstr "Deler"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:36 personal.php:37
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr "Interlingua"
@@ -324,11 +324,11 @@ msgstr "Plus"
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contrasigno"
@@ -423,39 +423,39 @@ msgstr "Nove contrasigno"
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-posta"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Tu adresse de e-posta"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Linguage"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Altere"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index f0a118496f4e048584047db630ea0fb6aa03b143..06eda6fd303f475fc57a065583c44124736dfd77 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contrasigno"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Adjuta"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index 5b5b3f334726881330a963bd51e4eb96910b33c7..a91b0b25c8cb31448ba31d2270ed007531f51417 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 99b5e5b934d3a877fb3f055a336a891addbf9d38..ae8bf811e4e3c470d03d0b90c2c3217d25da7a37 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "tahun kemarin"
msgid "years ago"
msgstr "beberapa tahun lalu"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Oke"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Pilih"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Pilih"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Tidak"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Oke"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Selesaikan instalasi"
msgid "web services under your control"
msgstr "layanan web dalam kontrol Anda"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Keluar"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 12d75c1e30785056ae81c65e52770f21b0989917..12586133ad5eac1a52c5a32ebf7aa50b10959eeb 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 0bcbac256783fde5fe50042fa7d2a8c9e3697b32..573bf66a00a20164f73f597627318a0e43cc84d6 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Menyimpan..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Enkripsi"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Enkripsi berkas aktif."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Tipe berkas berikut tidak akan dienkripsi:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Kecualikan tipe berkas berikut dari enkripsi:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Tidak ada"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index af35c34bf0fe2b32cf9e32de7bd0864f5afb987a..bc601626910dace7e94c064ac1f747ebee0ce75d 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 7e044193ad619f5b7db3ee65acc97d52ed233b16..e0f2c6ca1cd414069534c98f8dc59819240ce7e1 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index d701cfac2ef2c789b2eeb2cc125fb947171400ab..feac24537213922edadcef9a414798e80684732a 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Tidak dapat menghapus permanen %s"
msgid "Couldn't restore %s"
msgstr "Tidak dapat memulihkan %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "jalankan operasi pemulihan"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Galat"
@@ -39,31 +39,31 @@ msgstr "Galat"
msgid "delete file permanently"
msgstr "hapus berkas secara permanen"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Hapus secara permanen"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nama"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Dihapus"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 folder"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} folder"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 berkas"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} berkas"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 24b9a2f18c9f62a25249df413835a1e6e4fc0431..a22d263e44e0887dedf0002a2ccda7c9b901d75b 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 88c6934ad62968a37e146a3f4a0f16f61de27a79..9e263fa8896945ef5457ff6cd486cc9d4d86d159 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Bantuan"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pribadi"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Setelan"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Pengguna"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikasi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Pengunduhan ZIP dimatikan."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Berkas harus diunduh satu persatu."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Kembali ke Daftar Berkas"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "tidak dapat ditentukan"
@@ -113,72 +113,76 @@ msgstr "%sAnda tidak boleh menggunakan karakter titik pada nama basis data"
msgid "%s set the database host."
msgstr "%s setel host basis data."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Galat Basis Data: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Perintah yang bermasalah: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Hapus pengguna ini dari MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Hapus pengguna ini dari MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d462146a70c85a3bc7501f2d460a0ae1a8972812..1b000f8b87815b48b561237b315fa2c0c2f2583c 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Diperbarui"
msgid "Saving..."
msgstr "Menyimpan..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "dihapus"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "urungkan"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grup"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Hapus"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "tambah grup"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Tuliskan nama pengguna yang valid"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Gagal membuat pengguna"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
@@ -324,11 +324,11 @@ msgstr "Lainnya"
msgid "Less"
msgstr "Ciutkan"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
msgid "Show First Run Wizard again"
msgstr "Tampilkan Penuntun Konfigurasi Awal"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Sandi"
@@ -423,39 +423,39 @@ msgstr "Sandi baru"
msgid "Change password"
msgstr "Ubah sandi"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nama Tampilan"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Alamat email Anda"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nama Masuk"
@@ -463,30 +463,34 @@ msgstr "Nama Masuk"
msgid "Create"
msgstr "Buat"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Penyimpanan Baku"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Tak terbatas"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Lainnya"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Penyimpanan"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "ubah nama tampilan"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "setel sandi baru"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 4a2648e5ce087be68ff7e2ed5f41b08e7e8c4383..bf1a1d3f440f3f7c54df23e5fa893551800e3adf 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Gagal menghapus konfigurasi server"
@@ -53,281 +57,363 @@ msgstr "Biarkan pengaturan?"
msgid "Cannot add server configuration"
msgstr "Gagal menambah konfigurasi server"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukses"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Galat"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Tes koneksi sukses"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Tes koneksi gagal"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Konfirmasi Penghapusan"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Konfigurasi server"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Tambah Konfigurasi Server"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Satu Base DN per baris"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Sandi"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "gunakan saringan login"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Daftar Filter Pengguna"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "saringan grup"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definisikan filter untuk diterapkan saat menerima grup."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Pengaturan Koneksi"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurasi Aktif"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host Cadangan (Replika)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Port Cadangan (Replika)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Nonaktifkan Server Utama"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "gunakan TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "matikan validasi sertivikat SSL"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Gunakan Tembolok untuk Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "dalam detik. perubahan mengosongkan cache"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Pengaturan Direktori"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Bidang Tampilan Nama Pengguna"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Pohon Pengguna Dasar"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Satu Pengguna Base DN per baris"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atribut Pencarian Pengguna"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Pilihan; satu atribut per baris"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Bidang Tampilan Nama Grup"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Pohon Grup Dasar"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Satu Grup Base DN per baris"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atribut Pencarian Grup"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "asosiasi Anggota-Grup"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atribut Khusus"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Bidang Kuota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Kuota Baku"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Bidang Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Aturan Penamaan Folder Home Pengguna"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Uji Konfigurasi"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Bantuan"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 89a9bc5bcd3ffcc9fdef3411fd2901768f2c6661..f4b9d4b50e5f31c548d7cc4003cb2de4ceb04bf8 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Widya Walesa <walecha99@gmail.com>, 2013.
+# w41l <walecha99@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0fcf1d0e314cf3288c17ab7e5809b992b5768d71..cb3a337262cffecb0904abd52724da7989177304 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "síðasta ári"
msgid "years ago"
msgstr "einhverjum árum"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Í lagi"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Veldu"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Hætta við"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Veldu"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Í lagi"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Virkja uppsetningu"
msgid "web services under your control"
msgstr "vefþjónusta undir þinni stjórn"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Útskrá"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 62c5f2deed6cf73e9d917e2548df1a91fd4e43c1..89771c7ed56e6db963984b5531917782c842b32a 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 5c70420bc371a85e41c9931a5fa277d6cfba806f..1d993ab33690f0b4e2af41a96e233b40868e938b 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Er að vista ..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Dulkóðun"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ekkert"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index e92632bcfa08959ef74bc8771a839af7c2973bf2..0cff6001507b95f8bbc056fc54fc7104947e79da 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index bd919a4af317158dffc6ecdb3c1a600be810547f..aba9b4e8da28671544edb6ed2afbff71b3f24090 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 180cfb3bd3efc18f785eecf711f2530121c3ec5a..ef4d5da4a6e6100e905d900c393fd72eea368209 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Villa"
@@ -39,31 +39,31 @@ msgstr "Villa"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nafn"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mappa"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} möppur"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 skrá"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} skrár"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 0f8c3dd0c344684dddbe16ef039707139bcf4389..ad7f909d9f4a9682fb5aeca5794c3014d3827775 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 3aa394501c133948790b7c984a26ad9e112f05e2..fdb277e7664673ee0ee6a998f4614972e63af333 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjálp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Um mig"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Stillingar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Notendur"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Forrit"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Stjórnun"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Slökkt á ZIP niðurhali."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Skrárnar verður að sækja eina og eina"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Aftur í skrár"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 6bc82b29441be46fc74221f8271d45ba5db64918..a70339dd89c8f8ca3eb6ff82f69f4e3bb7d395cd 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Er að vista ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "afturkalla"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eyða"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Meira"
msgid "Less"
msgstr "Minna"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lykilorð"
@@ -423,39 +423,39 @@ msgstr "Nýtt lykilorð"
msgid "Change password"
msgstr "Breyta lykilorði"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Netfang"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Netfangið þitt"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Tungumál"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hjálpa við þýðingu"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Búa til"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Sjálfgefin gagnageymsla"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ótakmarkað"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Annað"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "gagnapláss"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 707f5e97758ac80b92fc6c2b038b25e9d253bc84..42655e49061f704d2605721258233593540af86b 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Villa"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Netþjónn"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lykilorð"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjálp"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 66194d2dae2979baf2a34eef6fab1e8ac0c283c7..6daf7cdbf02fba8cfdfaabe59bb6cef75ac57dab 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <sveinng@gmail.com>, 2012.
+# sveinn <sveinng@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index ce6ac93cb799a656d597d9baf1530d26308546ed..5c47ff5fa6879b66b19370990ef0ae3d92a1d1ab 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 07:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "anno scorso"
msgid "years ago"
msgstr "anni fa"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Scegli"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annulla"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Scegli"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Errore durante il caricamento del modello del selezionatore di file"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Termina la configurazione"
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Esci"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 59ff6298b4778cf0f505f42f4c3fa5633967247c..87ac3c24631d1981c56a6c44882987190e4cacf0 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} file"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 6bd8dcce9aa2c924a59c8ca9c4c42796de9bb8d5..d4916e8b50e6c7b0d0de806117537b527379754f 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 04:40+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Chiave di ripristino abilitata correttamente"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino."
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Chiave di ripristinata disabilitata correttamente"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino."
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Password modificata correttamente."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Impossibile cambiare la password. Forse la vecchia password non era corretta."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Salvataggio in corso..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Cifratura"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La cifratura dei file è abilitata."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Password di ripristino dell'account"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Abilitata"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Disabilitata"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Cambia la chiave di ripristino delle password di cifratura:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Vecchia password di ripristino dell'account"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Nuova password di ripristino dell'account"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Modifica password"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Abilita il ripristino della password condividendo tutti i file con l'amministratore:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "I seguenti tipi di file non saranno cifrati:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "L'abilitazione di questa opzione ti consentirà di ottenere nuovamente accesso ai tuoi file cifrati in caso di smarrimento della password"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Escludi i seguenti tipi di file dalla cifratura:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Impostazioni di ripristino dei file aggiornate"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nessuno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Impossibile aggiornare il ripristino dei file"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index aeafcdb3098b3bbeb302731194557e733a7a8a81..912c686bb8197cf0c0a631405ffed13ecd0bd844 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 64e3b10980ef6453a208c483adeb485377576519..49f2233620b0bd6293240aa61cb4564071b23b15 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 31244b0df3dff645d5e4c8f4ddecaadaca99675a..d0590c78c7fc295d7790b19024a3b74bbdf182da 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +27,11 @@ msgstr "Impossibile eliminare %s definitivamente"
msgid "Couldn't restore %s"
msgstr "Impossibile ripristinare %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "esegui operazione di ripristino"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Errore"
@@ -39,31 +39,31 @@ msgstr "Errore"
msgid "delete file permanently"
msgstr "elimina il file definitivamente"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Elimina definitivamente"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Eliminati"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 cartella"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} cartelle"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 file"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} file"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 9009790625e47db03025e29820eefb94e5382399..eecb2f8f5e5f4da18151c63ad2a434d46c01b8e1 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index bf15d74fffc59b29b8e56a4be415cca1c9c84413..e704f319f13dd6f41fd1218347a9de7bdcb9d6c7 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Aiuto"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personale"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Impostazioni"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utenti"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applicazioni"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "I file devono essere scaricati uno alla volta."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Torna ai file"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "I file selezionati sono troppo grandi per generare un file zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "non può essere determinato"
@@ -113,72 +114,76 @@ msgstr "%s non dovresti utilizzare punti nel nome del database"
msgid "%s set the database host."
msgstr "%s imposta l'host del database."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome utente e/o password di PostgreSQL non validi"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "È necessario inserire un account esistente o l'amministratore."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome utente e/o password di Oracle non validi"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "La connessione a Oracle non può essere stabilita"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome utente e/o password di MySQL non validi"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Errore DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Il comando non consentito era: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'utente MySQL '%s'@'localhost' esiste già."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Elimina questo utente da MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'utente MySQL '%s'@'%%' esiste già"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Elimina questo utente da MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome utente e/o password di Oracle non validi"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome utente e/o password MS SQL non validi: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index bed35b958128700932c5387c8d22800822724604..b3531ea04b0692324829d44520b08d115ad7b333 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -124,44 +125,44 @@ msgstr "Aggiornato"
msgid "Saving..."
msgstr "Salvataggio in corso..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "eliminati"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "annulla"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Impossibile rimuovere l'utente"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppi"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppi amministrati"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Elimina"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "aggiungi gruppo"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Deve essere fornito un nome utente valido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Errore durante la creazione dell'utente"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
@@ -318,17 +319,17 @@ msgstr "Livello di log"
#: templates/admin.php:227
msgid "More"
-msgstr "Più"
+msgstr "Altro"
#: templates/admin.php:228
msgid "Less"
msgstr "Meno"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versione"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +400,7 @@ msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
msgid "Show First Run Wizard again"
msgstr "Mostra nuovamente la procedura di primo avvio"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Password"
@@ -423,39 +424,39 @@ msgstr "Nuova password"
msgid "Change password"
msgstr "Modifica password"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nome visualizzato"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Posta elettronica"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Il tuo indirizzo email"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Lingua"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Migliora la traduzione"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome utente"
@@ -463,30 +464,34 @@ msgstr "Nome utente"
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Password di ripristino amministrativa"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Archiviazione predefinita"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Illimitata"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Altro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Archiviazione"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "cambia il nome visualizzato"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "imposta una nuova password"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 55a4663df93b9a935c598eecd8d88000bc9d72c0..01e4970a27d3359ad6da96011042dec594f76b36 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Cancellazione delle associazioni non riuscita."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Eliminazione della configurazione del server non riuscita"
@@ -53,281 +58,363 @@ msgstr "Vuoi mantenere le impostazioni?"
msgid "Cannot add server configuration"
msgstr "Impossibile aggiungere la configurazione del server"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "associazioni cancellate"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Riuscito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Errore"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Prova di connessione riuscita"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Prova di connessione non riuscita"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Conferma l'eliminazione"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configurazione del server"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Aggiungi configurazione del server"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN base per riga"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN utente"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Password"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro per l'accesso utente"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro per l'elenco utenti"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro per il gruppo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Impostazioni di connessione"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configurazione attiva"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Se deselezionata, questa configurazione sarà saltata."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host di backup (Replica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porta di backup (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Disabilita server principale"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Se abilitata, ownCloud si collegherà solo al server di replica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Da non utilizzare per le connessioni LDAPS, non funzionerà."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case insensitve LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Disattiva il controllo del certificato SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Non consigliato, utilizzare solo per test."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Tempo di vita della cache"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in secondi. Il cambio svuota la cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Impostazioni delle cartelle"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo per la visualizzazione del nome utente"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Struttura base dell'utente"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN base utente per riga"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Attributi di ricerca utente"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opzionale; un attributo per riga"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo per la visualizzazione del nome del gruppo"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Struttura base del gruppo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN base gruppo per riga"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Attributi di ricerca gruppo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associazione gruppo-utente "
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Attributi speciali"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo Quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota predefinita"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in byte"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regola di assegnazione del nome della cartella utente"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome utente interno"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Attributo nome utente interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Ignora rilevamento UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Attributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Associazione Nome utente-Utente LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Cancella associazione Nome utente-Utente LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Prova configurazione"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Aiuto"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index f88d74e447e70ae25e99d6de581218917666fc3a..342564faf720c0b97cc7b0c7ee83e52d1d3ea132 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index e0a0299d06d0829b0f0e9bc991992fd414fc36c9..5cd2d7c36f13acc2066585717a6b1d072d8ce037 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-07 07:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "一年前"
msgid "years ago"
msgstr "年前"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "選択"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "キャンセル"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "選択"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "ファイルピッカーのテンプレートの読み込みエラー"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "はい"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "いいえ"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "セットアップを完了します"
msgid "web services under your control"
msgstr "管理下のウェブサービス"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "ログアウト"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index bf5947b4430deb92a9597533ac3e44a7a915d7bd..f18a6daef91589735778ca30af509194ead67a78 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -217,7 +218,7 @@ msgstr "{count} ファイル"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 90764dc0dae0e42aba1880bd87d5afd86ff17aab..218b16a00e60261d349d6ff1a5016d51f407c82e 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-01 01:58+0200\n"
+"PO-Revision-Date: 2013-05-31 06:00+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -17,22 +19,87 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "リカバリ用のキーは正常に有効化されました"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい！"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "リカバリ用のキーを正常に無効化しました"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "パスワードを変更できました。"
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。"
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "保存中..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "暗号化"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ファイルの暗号化は有効です。"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "復旧アカウントのパスワード"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "有効"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "無効"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "復旧キーの暗号化パスワードを変更:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "古い復旧アカウントのパスワード"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "新しい復旧アカウントのパスワード"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "パスワードを変更"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "管理者が全ての共有ファイルに対してパスワードによる復旧を有効にする:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "次のファイルタイプは暗号化されません:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "次のファイルタイプを暗号化から除外:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "ファイル復旧設定が更新されました"
-#: templates/settings.php:12
-msgid "None"
-msgstr "なし"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "ファイル復旧を更新できませんでした"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index ebea1cd8427439f25e941f3030ab3f763f78a7e0..df05798dbd0674a52e910a245cde461dfd8c73b5 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index c6e1114ec1f3967d050d368f1bb9ceb8bd5f2662..9205b518b17c1e0ba0a666e8429cdde6fc9f2cb3 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index e3d441e8879d4c615ac5c45d7a3afd1a26f79534..c90517e4d2b3f88d4bb9cc6057b947770d85c8a9 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "%s を完全に削除出来ませんでした"
msgid "Couldn't restore %s"
msgstr "%s を復元出来ませんでした"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "復元操作を実行する"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "エラー"
@@ -39,31 +39,31 @@ msgstr "エラー"
msgid "delete file permanently"
msgstr "ファイルを完全に削除する"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "完全に削除する"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "名前"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "削除済み"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 フォルダ"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} フォルダ"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ファイル"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ファイル"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 62a28eb62b825253a812ec23b9be60339a13bd2b..2b62bba4cc1517b7bd944c70aedd5c18285aa855 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index a65b9bba7667bbba773374673ddc91832a46ddd8..830bc082d4b7595920a7c51d15f09f2b6ceb0750 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ヘルプ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "個人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "設定"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ユーザ"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "アプリ"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管理"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIPダウンロードは無効です。"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "ファイルは1つずつダウンロードする必要があります。"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "ファイルに戻る"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "測定できませんでした"
@@ -113,72 +114,76 @@ msgstr "%s ではデータベース名にドットを利用できないかもし
msgid "%s set the database host."
msgstr "%s にデータベースホストを設定します。"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQLのユーザ名もしくはパスワードは有効ではありません"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "既存のアカウントもしくは管理者のどちらかを入力する必要があります。"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Oracleへの接続が確立できませんでした。"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQLのユーザ名もしくはパスワードは有効ではありません"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DBエラー: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "違反コマンド: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQLのユーザ '%s'@'localhost' はすでに存在します。"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "MySQLからこのユーザを削除"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQLのユーザ '%s'@'%%' はすでに存在します。"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "MySQLからこのユーザを削除する。"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "違反コマンド: \"%s\"、名前: %s、パスワード: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 3902b760a083895d32002a664ebb9e1ad4de1747..6b990ab4951bead6d8d8d478100c843105abbd30 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 04:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\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"
@@ -125,44 +126,44 @@ msgstr "更新済み"
msgid "Saving..."
msgstr "保存中..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "削除"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "元に戻す"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "ユーザを削除出来ません"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "グループ"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "グループ管理者"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "削除"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "グループを追加"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "有効なユーザ名を指定する必要があります"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "ユーザ作成エラー"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "有効なパスワードを指定する必要があります"
@@ -325,11 +326,11 @@ msgstr "もっと見る"
msgid "Less"
msgstr "閉じる"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "バージョン"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "ファイルを同期するためのアプリを取得"
msgid "Show First Run Wizard again"
msgstr "初回ウィザードを再表示する"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "パスワード"
@@ -424,39 +425,39 @@ msgstr "新しいパスワードを入力"
msgid "Change password"
msgstr "パスワードを変更"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "表示名"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "メール"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "あなたのメールアドレス"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "言語"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "翻訳に協力する"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "ログイン名"
@@ -464,30 +465,34 @@ msgstr "ログイン名"
msgid "Create"
msgstr "作成"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "管理者復旧パスワード"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "デフォルトストレージ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "無制限"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "その他"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ストレージ"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "表示名を変更"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "新しいパスワードを設定"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 7e169d97e48e4641982e3ff80c10aec439bbb401..648af63c11a18fd127a26c6b44b40b69f306b33a 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-08 13:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "マッピングのクリアに失敗しました。"
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "サーバ設定の削除に失敗しました"
@@ -54,281 +58,363 @@ msgstr "設定を保持しますか？"
msgid "Cannot add server configuration"
msgstr "サーバ設定を追加できません"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "マッピングをクリアしました"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "エラー"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "接続テストに成功しました"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "接続テストに失敗しました"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "現在のサーバ設定を本当に削除してもよろしいですか？"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "削除の確認"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。"
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "サーバ設定"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "サーバ設定を追加"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ホスト"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "ベースDN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "1行に1つのベースDN"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "ユーザDN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "パスワード"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ユーザログインフィルタ"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ユーザリストフィルタ"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "グループフィルタ"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "グループを取得するときに適用するフィルターを定義する。"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "接続設定"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "設定はアクティブです"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "チェックを外すと、この設定はスキップされます。"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "ポート"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "バックアップ（レプリカ）ホスト"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "バックアップ（レプリカ）ポート"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "メインサーバを無効にする"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "有効にすると、ownCloudはレプリカサーバにのみ接続します。"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLSを利用"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL証明書の確認を無効にする。"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "推奨しません、テスト目的でのみ利用してください。"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "キャッシュのTTL"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "秒。変更後にキャッシュがクリアされます。"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ディレクトリ設定"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "ユーザ表示名のフィールド"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ベースユーザツリー"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "1行に1つのユーザベースDN"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "ユーザ検索属性"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "オプション：1行に1属性"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "グループ表示名のフィールド"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "グループのownCloud名の生成に利用するLDAP属性。"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ベースグループツリー"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "1行に1つのグループベースDN"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "グループ検索属性"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "グループとメンバーの関連付け"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "クォータフィールド"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "クォータのデフォルト"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "バイト"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "メールフィールド"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "ユーザのホームフォルダ命名規則"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "内部ユーザ名"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が必要ないことを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。"
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "内部ユーザ名属性:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "UUID検出を再定義する"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "デフォルトでは、ownCloud は UUID 属性を自動的に検出します。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。"
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID属性:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "ユーザ名とLDAPユーザのマッピング"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloudは（メタ） データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ownCloudユーザ名とLDAPユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、LDAPユーザのUUIDとマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更をownCloudが見つけます。内部のownCloud名はownCloud全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "グループ名とLDAPグループのマッピングをクリアする"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "設定をテスト"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ヘルプ"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index 2341b9f95c72b93cdd0cd03f102c7358e294c0b2..9db2784888df7e417392d0c9347ef48a72a7bbc0 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 3840fc7208c7c981ee5d66fe812e300ffd1b91b4..fc467e8e09f8ab8dae49086a925d4395f4a5c4b8 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index b139973c0ca0c32333e265ddfcb3bee4d0a71ba7..4a2db5dd214eddfcd3255716a2a04274f216a7ad 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 06cfd02260e3e57ca51b43cbe075bc5fbff606a1..12883dff6471a6bedcd0479b0ddd9fc756e92a41 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ka/files_external.po b/l10n/ka/files_external.po
index a9eecf3b31f35f07cd374aecfe0b6e9e5b67dd49..b0114117f5bae0827b0b7f615d368dd553eefe1c 100644
--- a/l10n/ka/files_external.po
+++ b/l10n/ka/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 9590d263fb3c043107c2aaa62badf5cd852dcb52..53dd73051d06c3e9fef868a140af1e2e5de57826 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index 934d68261ea14ed776a20af937659157f1149912..f40050033f21b02d8952425bc2d366be01322489 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_versions.po b/l10n/ka/files_versions.po
index fe02221e103dda9e37fdbe1bc24e190864ae7396..c36ba25f09d4a8577b31ba931bb5a8884905cd75 100644
--- a/l10n/ka/files_versions.po
+++ b/l10n/ka/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 26890fc56dc0c0b5ae404fc2725cdedbc4e6f67a..9974f858cf014572d65f7ec6f0b160546d88cf61 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "შველა"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "პერსონა"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "მომხმარებლები"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP გადმოწერა გამორთულია"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index d7da24759a28b80b8d736b48098951dc0938d458..fe9f5ba85c54637c4565d9dc84fd56acc54be53c 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "პაროლი"
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index a6e12c17b84714be55a9979c3d9ff1e58eec45c5..d171be00d72574fee1306d1634c3db2b8547a5c4 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "პაროლი"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "შველა"
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
index 5433bc595c77dd9e8d0b0a0af0bfdea8c752640d..81c256549525ade1d31ea0b64d32718ab565a0ca 100644
--- a/l10n/ka/user_webdavauth.po
+++ b/l10n/ka/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 7051022af7b8ef46db233747e0418700ecb16062..94b9fc0e81d5d5a84e82b5c5c7321621df3573cf 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "ბოლო წელს"
msgid "years ago"
msgstr "წლის წინ"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "დიახ"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "არჩევა"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "უარყოფა"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "არჩევა"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "არა"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "დიახ"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "კონფიგურაციის დასრულება"
msgid "web services under your control"
msgstr "web services under your control"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "გამოსვლა"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 4977e0d493f24a9f1e4785a2ada6912de1d061eb..2b820d85a11b36945a26a5931e584e199a379598 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 6678dd7cc533592fa7578e3a78139462a8c5940b..d2b48f7eeb99d8ed59db45d3618443e5dfdba435 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "შენახვა..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ენკრიპცია"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ფაილის ენკრიპცია ჩართულია."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "შემდეგი ფაილური ტიპების ენკრიპცია არ მოხდება:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "ამოიღე შემდეგი ფაილის ტიპები ენკრიპციიდან:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "არა"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 203e29f7c011480f77e0369eb6bc39cdeeb81005..7dac10dfcea4b8e9d1f5c1630075b50f936e70dd 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:03+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 2cd7702bc648ae718fd5e3c5ea6e7fdb5dfe082d..6d12ca057519c698ac1ccb7adc926b93a0035de3 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:03+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 592898b1ea377e3d0e53b565c9d57ab1245a5c5a..d7d7fcb490b19df9d980ca38b754217356a01b09 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "ფაილი %s–ის სრულად წაშლა ვერ
msgid "Couldn't restore %s"
msgstr "%s–ის აღდგენა ვერ მოხერხდა"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "მიმდინარეობს აღდგენის ოპერაცია"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "შეცდომა"
@@ -39,31 +39,31 @@ msgstr "შეცდომა"
msgid "delete file permanently"
msgstr "ფაილის სრულად წაშლა"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "სრულად წაშლა"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "სახელი"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "წაშლილი"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 საქაღალდე"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} საქაღალდე"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ფაილი"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ფაილი"
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 87f15b8179cc8efb51cc7fe5090122d884f0d48f..35af4eeea3b2a1f7c82d1b6f53d721ddcc8b23d2 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index af7df55b76601805ab98ed1ed021b52826190fbc..e38755c8c8cd7e4c87b4ca9fe005c0552fede828 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "დახმარება"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "პირადი"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "პარამეტრები"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "მომხმარებელი"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "აპლიკაციები"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP download–ი გათიშულია"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "უკან ფაილებში"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "ვერ განისაზღვრა"
@@ -113,72 +113,76 @@ msgstr "%s არ მიუთითოთ წერტილი ბაზის
msgid "%s set the database host."
msgstr "%s მიუთითეთ ბაზის ჰოსტი."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB შეცდომა: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Offending ბრძანება იყო: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL მომხმარებელი '%s'@'localhost' უკვე არსებობს."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 734eede528730ac4a04cf7e1dccb8cc0119a46e2..f02a499b093611f02120c59b847a5f1a97e72fdd 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +125,44 @@ msgstr "განახლებულია"
msgid "Saving..."
msgstr "შენახვა..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "წაშლილი"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "დაბრუნება"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "ჯგუფები"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "ჯგუფის ადმინისტრატორი"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "წაშლა"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "ჯგუფის დამატება"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "შეცდომა მომხმარებლის შექმნისას"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "უნდა მიუთითოთ არსებული პაროლი"
@@ -325,11 +325,11 @@ msgstr "უფრო მეტი"
msgid "Less"
msgstr "უფრო ნაკლები"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "ვერსია"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "აპლიკაცია ფაილების სინქრო
msgid "Show First Run Wizard again"
msgstr "მაჩვენე თავიდან გაშვებული ვიზარდი"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "პაროლი"
@@ -424,39 +424,39 @@ msgstr "ახალი პაროლი"
msgid "Change password"
msgstr "პაროლის შეცვლა"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "დისპლეის სახელი"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "იმეილი"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "თქვენი იმეილ მისამართი"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "ენა"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "თარგმნის დახმარება"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "მომხმარებლის სახელი"
@@ -464,30 +464,34 @@ msgstr "მომხმარებლის სახელი"
msgid "Create"
msgstr "შექმნა"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "საწყისი საცავი"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ულიმიტო"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "სხვა"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "საცავი"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "შეცვალე დისფლეის სახელი"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "დააყენეთ ახალი პაროლი"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "საწყისი პარამეტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index cdc9f72873ff4b809fde0ef9308ebf3276b8639c..01096db8152a05f42ca23ba048c65c98ee4c3daa 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "შეცდომა სერვერის კონფიგურაციის წაშლისას"
@@ -53,281 +57,363 @@ msgstr "დავტოვოთ პარამეტრები?"
msgid "Cannot add server configuration"
msgstr "სერვერის პარამეტრების დამატება ვერ მოხერხდა"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "დასრულდა"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "კავშირის ტესტირება მოხერხდა"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "კავშირის ტესტირება ვერ მოხერხდა"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "წაშლის დადასტურება"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>გაფრთხილება:</b> აპლიკაციის user_ldap და user_webdavauth არათავსებადია. თქვენ შეიძლება შეეჩეხოთ მოულოდნელ შშედეგებს. თხოვეთ თქვენს ადმინისტრატორს ჩათიშოს ერთერთი."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "სერვერის პარამეტრები"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "სერვერის პარამეტრების დამატება"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ჰოსტი"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "საწყისი DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "ერთი საწყისი DN ერთ ხაზზე"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "თქვენ შეგიძლიათ მიუთითოთ საწყისი DN მომხმარებლებისთვის და ჯგუფებისთვის Advanced ტაბში"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "მომხმარებლის DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "პაროლი"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "მომხმარებლის ფილტრი"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "მომხმარებლებიის სიის ფილტრი"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "ჯგუფის ფილტრი"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "კავშირის პარამეტრები"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "კონფიგურაცია აქტიურია"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "პორტი"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "ბექაფ (რეპლიკა) ჰოსტი"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "ბექაფ (რეპლიკა) პორტი"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "გამორთეთ ძირითადი სერვერი"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "როცა მონიშნულია, ownCloud დაუკავშირდება მხოლოდ რეპლიკა სერვერს."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "გამოიყენეთ TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "გამორთეთ SSL სერთიფიკატის ვალიდაცია."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "იმ შემთხვევაში თუ მუშაობს მხოლოდ ეს ოფცია, დააიმპორტეთ LDAP სერვერის SSL სერთიფიკატი თქვენს ownCloud სერვერზე."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "ქეშის სიცოცხლის ხანგრძლივობა"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "წამებში. ცვლილება ასუფთავებს ქეშს."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "დირექტორიის პარამეტრები"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "მომხმარებლის დისფლეის სახელის ფილდი"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP ატრიბუტი მომხმარებლის ownCloud სახელის გენერაციისთვის."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ძირითად მომხმარებელთა სია"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "მომხმარებლის ძებნის ატრიბუტი"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "ოფციონალური; თითო ატრიბუტი თითო ხაზზე"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "ჯგუფის დისფლეის სახელის ფილდი"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP ატრიბუტი ჯგუფის ownCloud სახელის გენერაციისთვის."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ძირითად ჯგუფთა სია"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "ერთი ჯგუფის საწყისი DN ერთ ხაზზე"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "ჯგუფური ძებნის ატრიბუტი"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "ჯგუფის წევრობის ასოციაცია"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "სპეციალური ატრიბუტები"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "ქვოტას ველი"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "საწყისი ქვოტა"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "ბაიტებში"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "იმეილის ველი"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "კავშირის ტესტირება"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "დახმარება"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index a6662b7e1129c06b3129107f14f5ed88db882a84..275948740f4dd1c268bf4ba5ea6040f841a07960 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
+# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index b412b63b1ff51e2f40fed86b1b2934f640492b0a..d5e7454d04e082427f84acd6d5f8544257c24dee 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 6dc22644115d7c8c3324e868a3794d7e50e9085c..d8ead40a6064706155178d8833d417b06692633b 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 602b35e3e8f825dac2ad397994b91f1ec9f7f84d..dda2e54fa162be857fd40e113229c00fe6e97594 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index d73e3f29a793b2470bda4db37395d54d2c895cd7..61e30ed38236bc3c6fab01851d3dab95904c4460 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index 17f0921f70163ac6cf3cdba1d98d28ba71d1de20..a2eded06e4ee0e30cf57c5e8110b98015aeba073 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 1886595ceabc472e4f950e2a664f5edb81f06afd..28bf4f67f97f354da1cd42c3be0695a8c9e8be88 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_versions.po b/l10n/kn/files_versions.po
index 33d7a4a3b2540199b96113b8ab9919af53550dac..c61eacfeba8e482b655777cd8adbf41858c15ed2 100644
--- a/l10n/kn/files_versions.po
+++ b/l10n/kn/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 8bc47e9ad2cbb816e6ebff5092d156ecf68c9de7..2e4f63e50ecbd128820bfb46326e94bb5d0003e7 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 034be72d0ddaae1dd3ce589af5e4ac7c113f93d3..899150546d3eaf57cf0315927b311ea444860d41 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 3b3ac191a817ec21e39c4265e73f96b8768a1921..782e792ba8bca208e74dfc91a16c3629c2d33d1a 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/kn/user_webdavauth.po b/l10n/kn/user_webdavauth.po
index 1dde34b41e36efde9e6acbdf2432495e764e226f..771cd4f87ee1a94fb8a43c4c2cacc99d9bcea0fd 100644
--- a/l10n/kn/user_webdavauth.po
+++ b/l10n/kn/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 2e8b6e43eb6888e2e2571e78dbe8e2b354abd780..438b13e0d2efc92e8ba5f3236c9b86e8a25ecc10 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "작년"
msgid "years ago"
msgstr "년 전"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "승락"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "선택"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "취소"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "선택"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "아니요"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "승락"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "설치 완료"
msgid "web services under your control"
msgstr "내가 관리하는 웹 서비스"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "로그아웃"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 6ca79779ec309f59cadf4a5639b01c407688641c..d716be12d328b5b3406ccec7b81d50a7e9427285 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 432f5ed62559fe760ce20825adbe48f1b84a95de..4a5fd3c1fc2d0084c82a58c0541334ef3c4df7dc 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "저장 중..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "암호화"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "없음"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 05f9ba418c261fde83a080dfb138ea20a2f4eeba..ce2cfcc9148e29c85ec4598b21e1847326884271 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 245187c1159f1d92cc4f717cfaee002e5514903b..3e8a2238f145d0c05d6fd55a7a143807d346be98 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index c4e8c0dec404a987a06c541bbc8c63cab80cee3f..c35e4b4537492d21a082f8570a73dd5370c61935 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-08 15:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "오류"
@@ -39,31 +39,31 @@ msgstr "오류"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "영원히 삭제"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "이름"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "폴더 1개"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "폴더 {count}개"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "파일 1개"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "파일 {count}개"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index b3241be267d5d614e72e4e666ba668991e5903f7..ce0e200f0ba0a561749aff22cfd54bef9241cb19 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 06d9e41f52e21d300a9bd1850d396225e8c24c18..18c0671fc962e9b555a084825fc875ed27b7e71a 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "도움말"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "개인"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "설정"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "사용자"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "앱"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "관리자"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP 다운로드가 비활성화되었습니다."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "파일을 개별적으로 다운로드해야 합니다."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "파일로 돌아가기"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "결정할 수 없음"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 15aeff0cf97e47f8071987b5016dda64b7181e3d..b546ec16d2e46ade3ea79fbbe6f302571cb8760a 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-09 00:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "되돌리기"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "그룹"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "그룹 관리자"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "삭제"
@@ -153,15 +153,15 @@ msgstr "삭제"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "더 중요함"
msgid "Less"
msgstr "덜 중요함"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "버전"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다."
msgid "Show First Run Wizard again"
msgstr "첫 실행 마법사 다시 보이기"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "암호"
@@ -423,39 +423,39 @@ msgstr "새 암호"
msgid "Change password"
msgstr "암호 변경"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "표시 이름"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "이메일"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "이메일 주소"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "언어"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "번역 돕기"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "로그인 이름"
@@ -463,30 +463,34 @@ msgstr "로그인 이름"
msgid "Create"
msgstr "만들기"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "기본 저장소"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "무제한"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "기타"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "저장소"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "표시 이름 변경"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "새 암호 설정"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index e08a48a9b5c2d7f31e66f1d1bb611407c7e4e13b..c778c7bcac81c74e42b096622abe051037c147d0 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr "설정을 유지합니까?"
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "오류"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "연결 시험 성공"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "연결 시험 실패"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>경고:</b> user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "호스트"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "기본 DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "기본 DN을 한 줄에 하나씩 입력하십시오"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "사용자 DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "암호"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "사용자 로그인 필터"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "사용자 목록 필터"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "그룹 필터"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "연결 설정"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "구성 활성화"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "포트"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "백업 (복제) 포트"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "백업 (복제) 포트"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "주 서버 비활성화"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS 사용"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL 인증서 유효성 검사를 해제합니다."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "추천하지 않음, 테스트로만 사용하십시오."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "디렉토리 설정"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "사용자의 표시 이름 필드"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "기본 사용자 트리"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "사용자 DN을 한 줄에 하나씩 입력하십시오"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "사용자 검색 속성"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "그룹의 표시 이름 필드"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "기본 그룹 트리"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "그룹 기본 DN을 한 줄에 하나씩 입력하십시오"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "그룹 검색 속성"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "그룹-회원 연결"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "바이트"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "도움말"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 02c3920ceba670d4f3291f20ec12f22122edd9c9..07e03e883858a911f8b438b3d41f4f99579fdac7 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -3,15 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <aoiob4305@gmail.com>, 2013.
-# 남자사람 <cessnagi@gmail.com>, 2012.
-# Park Shinjo <kde@peremen.name>, 2013.
+# aoiob4305 <aoiob4305@gmail.com>, 2013
+# aoiob4305 <aoiob4305@gmail.com>, 2013
+# 남자사람 <cessnagi@gmail.com>, 2012
+# 남자사람 <cessnagi@gmail.com>, 2012
+# Shinjo Park <kde@peremen.name>, 2013
+# Shinjo Park <kde@peremen.name>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 4be0cb61d85e21e2f9d1967d120be87728f139f3..3efd4cb54c6a4c2f8b89a3c4db3331fbb37fc872 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "كۆتایی هات دهستكاریهكان"
msgid "web services under your control"
msgstr "ڕاژهی وێب لهژێر چاودێریت دایه"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "چوونەدەرەوە"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index faec0ff8edb930b3a652bd810e960ba7898e7978..1c9a37e3082fe821cd420b6051335132b8cb0a7c 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index c961a1e23dbfdd204d5e9ba989638b71dc384259..c8090c00e4432c9917d4d4641b683185585e2bf1 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "پاشکهوتدهکات..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "نهێنیکردن"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "هیچ"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index ff019f8366a13c0beda61cf231478907bfbe3635..39319cbb041c334998dcc4f51b25a468af34175a 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 291c1ca15a05985d4c817bd1359982a65e8501ec..66f5b470e8466ad446705744c4ac08dccf49f122 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index c875155aa9dcbe0c10a2764f4b1fb0d0264ddf03..599e316a48208e5aa35802cff9768736bda9ab0e 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "ههڵه"
@@ -39,31 +39,31 @@ msgstr "ههڵه"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "ناو"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index 0b3811c2a529b563afc0ae8ce08a7b8654084673..65c39e334385b96025e893d3f7d5c5478a6f8ef7 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 2bf8387dbb9eb03bae06702ba01562e1a1cd1aac..be6dc8e788fb7fb5302a0ee4d533d56a060eddd8 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "یارمەتی"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "دهستكاری"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "بهكارهێنهر"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "بهرنامهكان"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "بهڕێوهبهری سهرهكی"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a59db52635b82a6ddcdff4142479d0a5488006f3..e2f4cbba3991624d05cbf7e4d3e4f2220839560a 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "پاشکهوتدهکات..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -423,39 +423,39 @@ msgstr "وشەی نهێنی نوێ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "ئیمهیل"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 4830e9d27a5e193d698ea15b0fef5e980ddf7437..f49698d4ef6d263dae1a9ffb6f30d56aaa546aa8 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "سهرکهوتن"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "ههڵه"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "وشەی تێپەربو"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "یارمەتی"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index e623bd161b4be11e69c0ee8057b9ec37c22d7382..381e788ea49473987a60fc86a1e40c9fb4b72114 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 297e614c2b0524801fc87b75e512323265302362..cdaaafc10435693a9480e79dabacb9c45ae69cb9 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "Läscht Joer"
msgid "years ago"
msgstr "Joren hier"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Auswielen"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Ofbriechen"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Auswielen"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nee"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Installatioun ofschléissen"
msgid "web services under your control"
msgstr "Web Servicer ënnert denger Kontroll"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Ausloggen"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index b1e060dc20ee329e0693cacab965392ef5abbcca..9eded80484030f717f46ac016fd1d63f5d7366ff 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 09f6598370f47a981bf416abf62e49715c952774..304094fcb33bd3053fb3eed4a3759d62c98e2a92 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speicheren..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 2461cbdaeb55d4b76ab7763cf56e029601c93a93..18c7b57b885f36e71a4fa577858e5fb24725e5ba 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 8905aedf4333181bb39a521dec23e07ad0d2705c..a780767eb6b9874eaef729a98a0d1caa3e560662 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 55332908947b8ddb4bae5cca059beebdd01a38a4..d6bca58aa1ac43244ffa1dce0de06acb1b067308 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Fehler"
@@ -39,31 +39,31 @@ msgstr "Fehler"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Numm"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 7745e418c12083d62ebc15249734b103ff61a77e..8c2aad478e12eb1ee92d1d91f5d0990a68e6427f 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 6060004b5233d9b98ba5fab84a26af95fdb25eb8..77de4f8643fb9a4755e8a11f652d8ce37910b551 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hëllef"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Perséinlech"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Astellungen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Benotzer"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applicatiounen"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 8e088e758a13be7aa84e6cfcc47de53cda017749..5fb1196d33f7a43b126169e8e1ceea4d859fb057 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Speicheren..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "geläscht"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "réckgängeg man"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppen Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Läschen"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Méi"
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passwuert"
@@ -423,39 +423,39 @@ msgstr "Neit Passwuert"
msgid "Change password"
msgstr "Passwuert änneren"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Deng Email Adress"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Sprooch"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hëllef iwwersetzen"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Erstellen"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Aner"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index f6e6bd009ab1702c9c2461f5e2328d3cfa84f291..e89f5d783070dfdc7ff07b76ae13dbb369885648 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passwuert"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hëllef"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 093341b3d26cea395949efcb12cbca5e1ee56993..1bceab60dbff5a605bccbfb6d2900a7918e8b081 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index a6046c22ca811987f2e33ba233a90ae00c8151d9..23ebebc9ee311b329dade17a71eec2b1b014b1aa 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 12:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "praeitais metais"
msgid "years ago"
msgstr "prieš metus"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Gerai"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Pasirinkite"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Atšaukti"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Pasirinkite"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Gerai"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Baigti diegimą"
msgid "web services under your control"
msgstr "jūsų valdomos web paslaugos"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Atsijungti"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 4c54e269f65399e237c0fbca7ba01f5e23a65c67..b6f58efbe5d3bb2d8f7348908582e91c99a92288 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 0ee05335796aa051d0376e692aa724835941d1a9..8d1d63c95a12c4a39458bb8963d50dca7a858dbf 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Saugoma..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Šifravimas"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nieko"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 4e0ad2de0152c162723860b9347a4cde67f6df74..f84b40b00656b98260fe1feb0e6235f1852af59c 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Min2liz <min2lizz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Min2liz <min2lizz@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 3b808b373533988bd423c435ba520c217c63d90c..9a9fe7aa1a0480efa41306c9f4f22a87707816fd 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 77bed8165a4af7ca18ddda2d41ceb8c9f1b08167..6b009b4a122cd81f1fd3c0bbfb018be42b47a8eb 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Klaida"
@@ -39,31 +39,31 @@ msgstr "Klaida"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Pavadinimas"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 aplankalas"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} aplankalai"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 failas"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} failai"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 57d518462cda26c2c3ba8798a51ea886e13d0b57..393a714fb588b06acbfab9f11d531d8556234b6d 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 91b409910d1a6f19c23d4dfe9acbd11b6fe99f65..aaa943f9d4365af22edfb722d67bb01bc15a1ef1 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pagalba"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Asmeniniai"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nustatymai"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Vartotojai"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Programos"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administravimas"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP atsisiuntimo galimybė yra išjungta."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Failai turi būti parsiunčiami vienas po kito."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Atgal į Failus"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 164db54bc9829c0a71c10f728fe32c49a7d8aa2c..640edcbf5f201ff0efbd2d1ec7523ce3271bfc77 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Saugoma..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "anuliuoti"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupės"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Ištrinti"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Daugiau"
msgid "Less"
msgstr "Mažiau"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Slaptažodis"
@@ -423,39 +423,39 @@ msgstr "Naujas slaptažodis"
msgid "Change password"
msgstr "Pakeisti slaptažodį"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "El. Paštas"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Jūsų el. pašto adresas"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Kalba"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Padėkite išversti"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Sukurti"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Kita"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 26af0dbe27881a54e472a051d5eca4bd124d26f2..92110398949cd6f4f1968fa006d0af199da3de4a 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Klaida"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Slaptažodis"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupės filtras"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Prievadas"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Naudoti TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Išjungti SSL sertifikato tikrinimą."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nerekomenduojama, naudokite tik testavimui."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pagalba"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 9f842d853966c998e6f14eb181b19a00ccebb521..173f9167f2b25728d9f4ca67d2ba9819574d446f 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mindaugas <min2lizz@gmail.com>, 2013.
+# Min2liz <min2lizz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index ed8d247b10dea6503f3429054a18e84033565c96..4a746cc825860d73030c59b51a9d1d29bcab0709 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "gājušajā gadā"
msgid "years ago"
msgstr "gadus atpakaļ"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Labi"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Izvēlieties"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Atcelt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Izvēlieties"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jā"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nē"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Labi"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Pabeigt iestatīšanu"
msgid "web services under your control"
msgstr "tīmekļa servisi tavā varā"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Izrakstīties"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 5077cd29172b67d137da03eda694e350665391a8..61cd8e91c5a3a312c0050be6dd71f50cd86aa9d6 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index cc342439494bd6524e4334d14c10864b6471ba15..4d1d0d415bd0c1690e6bcd15f237f7fadf4e0221 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Saglabā..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Šifrēšana"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Datņu šifrēšana ir aktivēta."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Sekojošās datnes netiks šifrētas:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Sekojošos datņu tipus izslēgt no šifrēšanas:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nav"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 8f0bcb6261aef8aa2f52fd0de233a9632a0d4f9d..56e4020ed1bbc83f1c3c2832323359fcbb05366b 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index c3369954b84d49517936e592993971b386521625..363900d1c5ead9f19f5416c8bdbbb081602b08e4 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 46290b2436a487be290f319e481351154fbfc349..296e6d2c0cd803b132b0677d94457b3680049120 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Nevarēja pilnībā izdzēst %s"
msgid "Couldn't restore %s"
msgstr "Nevarēja atjaunot %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "veikt atjaunošanu"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Kļūda"
@@ -39,31 +39,31 @@ msgstr "Kļūda"
msgid "delete file permanently"
msgstr "dzēst datni pavisam"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Dzēst pavisam"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nosaukums"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Dzēsts"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mape"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mapes"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 datne"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} datnes"
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 7b0e211dbf8c771526b757968e4a79b0e8d79e67..440afe984ad8047dd84e45ab87ca079daaf49cde 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index c14518b06cc30c1448065a18ce98b6461ad08b91..36c289b8fa5a77624a5ddb2fa881787b81093f20 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Palīdzība"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personīgi"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Iestatījumi"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Lietotāji"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Lietotnes"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administratori"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP lejupielādēšana ir izslēgta."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Atpakaļ pie datnēm"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nevarēja noteikt"
@@ -113,72 +113,76 @@ msgstr "%s datubāžu nosaukumos nedrīkst izmantot punktus"
msgid "%s set the database host."
msgstr "%s iestatiet datubāžu serveri."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nav derīga PostgreSQL parole un/vai lietotājvārds"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Jums jāievada vai nu esošs vai administratora konts."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nav derīga MySQL parole un/vai lietotājvārds"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB kļūda — “%s”"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Vainīgā komanda bija “%s”"
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL lietotājs %s'@'localhost' jau eksistē."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Izmest šo lietotāju no MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL lietotājs '%s'@'%%' jau eksistē"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Izmest šo lietotāju no MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nav derīga MySQL parole un/vai lietotājvārds — %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 2fd80f4858a62d6d1546d1f3f14b43c099830aff..8ac181d5882ee50dcadb5ba4201b94dfea4721a4 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Atjaunināta"
msgid "Saving..."
msgstr "Saglabā..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "izdzests"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "atsaukt"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotāju"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Dzēst"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "pievienot grupu"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Jānorāda derīgs lietotājvārds"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Kļūda, veidojot lietotāju"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Jānorāda derīga parole"
@@ -324,11 +324,11 @@ msgstr "Vairāk"
msgid "Less"
msgstr "Mazāk"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
msgid "Show First Run Wizard again"
msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parole"
@@ -423,39 +423,39 @@ msgstr "Jauna parole"
msgid "Change password"
msgstr "Mainīt paroli"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Redzamais vārds"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-pasts"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Jūsu e-pasta adrese"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Valoda"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Palīdzi tulkot"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Ierakstīšanās vārds"
@@ -463,30 +463,34 @@ msgstr "Ierakstīšanās vārds"
msgid "Create"
msgstr "Izveidot"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Noklusējuma krātuve"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Neierobežota"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Cits"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Krātuve"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "mainīt redzamo vārdu"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "iestatīt jaunu paroli"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 100f2ca501a158fe743d911a356fca506662a206..45460c20e1304c707f42539a2a6ba647b38a877c 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Neizdevās izdzēst servera konfigurāciju"
@@ -53,281 +57,363 @@ msgstr "Paturēt iestatījumus?"
msgid "Cannot add server configuration"
msgstr "Nevar pievienot servera konfigurāciju"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Kļūda"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Savienojuma tests ir veiksmīgs"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Savienojuma tests cieta neveiksmi"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Apstiprināt dzēšanu"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Brīdinājums:</b> lietotnes user_ldap un user_webdavauth ir nesavietojamas. Tās var izraisīt negaidītu uzvedību. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Servera konfigurācija"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Pievienot servera konfigurāciju"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Resursdators"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Bāzes DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Viena bāzes DN rindā"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Lietotāja DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parole"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Lietotāja ierakstīšanās filtrs"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lietotāju saraksta filtrs"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupu filtrs"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Savienojuma iestatījumi"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurācija ir aktīva"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Ports"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Rezerves (kopija) serveris"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Rezerves (kopijas) ports"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deaktivēt galveno serveri"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Kad ieslēgts, ownCloud savienosies tikai ar kopijas serveri."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Lietot TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Izslēgt SSL sertifikātu validēšanu."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ja savienojums darbojas ar šo opciju, importē LDAP serveru SSL sertifikātu savā ownCloud serverī."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nav ieteicams, izmanto tikai testēšanai!"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Kešatmiņas dzīvlaiks"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Direktorijas iestatījumi"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Lietotāja redzamā vārda lauks"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP atribūts, ko izmantot lietotāja ownCloud vārda veidošanai."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Bāzes lietotāju koks"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Viena lietotāju bāzes DN rindā"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Lietotāju meklēšanas atribūts"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Neobligāti; viens atribūts rindā"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Grupas redzamā nosaukuma lauks"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP atribūts, ko izmantot grupas ownCloud nosaukuma veidošanai."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Bāzes grupu koks"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Viena grupu bāzes DN rindā"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Grupu meklēšanas atribūts"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Grupu piederības asociācija"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Īpašie atribūti"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kvotu lauks"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Kvotas noklusējums"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "baitos"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-pasta lauks"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testa konfigurācija"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Palīdzība"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index d866091dc06c0c8278f5ea302feb892da389f3b8..bc46877310002c92c422d85ed2ee1ed6d741aeb2 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index cca6e22f555d016727450e486f0ae0e78610e4a9..313e7afe179ef1048ab68ad2098d8b32372e6af8 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "минатата година"
msgid "years ago"
msgstr "пред години"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Во ред"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Избери"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Избери"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Не"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Во ред"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Заврши го подесувањето"
msgid "web services under your control"
msgstr "веб сервиси под Ваша контрола"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Одјава"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 15433ffccd4cb449d99bd02dcb5fd3bfb7d75422..2a907e8064f383cac94519c9e5ae271e4646011c 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 42d168af09c3abcb8c1c0849a5a69055b0615dba..5ccdc506c2ca4bb5bef6e8ddb996c0f950dd7c8f 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Снимам..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ништо"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index c1d7e75e2ecdf68c9bea27d167ed5db8eca7e850..6da9a4c5b4bc6af00fca944a4d770cc6abd22e87 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 34a139dd73363a72ed9624cdbde950b4213c9916..1cf38e52a3d70eaec61883eefa614d349c7c3095 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 53216a98dea47189654e148cdc3df25ec79615f5..86dfbed28ae1f0edc6a07087297deb7580ac8805 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Грешка"
@@ -39,31 +39,31 @@ msgstr "Грешка"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} папки"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 датотека"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} датотеки"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index a25f7e9a24ef8a0ad89fcd676c96274cb81a2de4..0f4762644949780952c42bddc7d25036f28c8a28 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index e64e413995bc93c551fefbfd4bca4f6f9b0be774..8465ef142074eeb37c49590f74f4c40d5a9dd840 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помош"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Лично"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Подесувања"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Корисници"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Аппликации"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Админ"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Преземање во ZIP е исклучено"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Датотеките треба да се симнат една по една."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Назад кон датотеки"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Избраните датотеки се преголеми за да се генерира zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 7e664ae61dbdeb984400d59750f2d8a02e9babbe..17ecb1aabfaceba12cb2db9c634c519c35ea9956 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Снимам..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "врати"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Администратор на група"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Избриши"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Повеќе"
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Лозинка"
@@ -423,39 +423,39 @@ msgstr "Нова лозинка"
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Вашата адреса за е-пошта"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Јазик"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Користете ја оваа адреса да "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Создај"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Останато"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 92d9c35763e255c50d9bde7bfcd73704decd9ce2..04e212b30e4f2db278a084c62d7417f50d599b32 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Домаќин"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Лозинка"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помош"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index f396468a5d5b3b5f27d5a3f2b02c7b930f761397..78f50a5abe44e8796dfe8dd40c2a83d54f121af6 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Georgi Stanojevski <glisha@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 4559ef41db5ab282f2141d79a71d3955f314d34f..e8c1a6bde3fc00feeb83d9e0925a24738447a507 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Tidak"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Setup selesai"
msgid "web services under your control"
msgstr "Perkhidmatan web di bawah kawalan anda"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Log keluar"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index df4e1fb7804cd0e68a0ac1e23750dcba45c5c255..e7b0357a3ce220b959f675fe7ae37b66b16df827 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 15afa59d328e1e389787a951ab8a9f5c9dfc2dd5..bbbe2f3aa5a83ec784e087ba855e6af074e7501c 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Simpan..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index f1af46895a0f29e56b6814362f6fd232e960af44..36a6392e39a57316de49032c921c3e501d1945cc 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index e2dd17359731c2528637480413c6303cd2e843de..efab3f4042f4594bdd6803ba28cdcb4d3775a184 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 8eaef7bab2da09619fb05c0df0fa39e0dd44791a..f70d21e7140af2d0404bd8fd4b322fc29dbfa3ec 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Ralat"
@@ -39,31 +39,31 @@ msgstr "Ralat"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nama"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 22e8fd74325595834da9c2265547b543ec207f19..c76d0b2b739466fe46c5c9eba518156382529037 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 7d00ce42b9e364a78c9de5ca2b3d96193574a4d7..145dfa69af5b81c7e35dc71ad616139b95aa1ccd 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Bantuan"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Peribadi"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Tetapan"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Pengguna"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikasi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index b86d2eb41ba6ddd2fcceacd3d41bf2bc301a0c40..484e24be5935ff83d40ed17b908c18110570f202 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Simpan..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "dihapus"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Kumpulan"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Padam"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Lanjutan"
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Kata laluan"
@@ -423,39 +423,39 @@ msgstr "Kata laluan baru"
msgid "Change password"
msgstr "Ubah kata laluan"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Alamat emel anda"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Bantu terjemah"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Buat"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Lain"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index f8d3c3c7fb10aee4adb86ea7b3c2ceb523395ba5..1df50e9ef62ea59024f6f7c0321088b75380789f 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ralat"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Kata laluan"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Bantuan"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index c2284a13600aa067845fc1e984d60301164731c0..acf08a184c102ca56b208050322485b83418e8c1 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 46e82a3f92c4b1f4c99710263b7de83c0cb982d6..ea59f428ab422cc5842b0c49d467c9c721a0eb9b 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "မနှစ်က"
msgid "years ago"
msgstr "နှစ် အရင်က"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "အိုကေ"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "ရွေးချယ်"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ပယ်ဖျက်မည်"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "ရွေးချယ်"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ဟုတ်"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "မဟုတ်ဘူး"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "အိုကေ"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
msgid "web services under your control"
msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index fedecb2ad5a8855ca6af54d7c24423e52c584c29..d9769ad9231f174954e683e285feadf9f5072971 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 0980592321348d93b44e23715492843cc490f0e8..876bedaf9148dc863b058196602aa99d90a8a015 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index d6fae81ea26f830f83f4017adbf057c7cd8e493f..12ae346136a92075bd87d1e50461fd741e537a87 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 1105b88661f810939707e59ecf3657f27f798680..0b655da998fc9aa895b577ce3f1704363f00aa82 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 910708197888e0e0ef6658ebd3ebbd147f1677d3..6c22f6131851e74ad1db201ebe8de1584cabd1bb 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
index 57a0f93840e2bf0d9e1096f270f96099e51d4dff..60f265294d1088304633d7c93421429c54cf17ea 100644
--- a/l10n/my_MM/files_versions.po
+++ b/l10n/my_MM/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index f6ebed8ec4184526d70525a9d76796cd4cfb77df..fed2bd8bf6100670c724129e3b02eec511ec1bd5 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "အကူအညီ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "သုံးစွဲသူ"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "အက်ဒမင်"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "ဖိုင်သို့ပြန်သွားမည်"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "မဆုံးဖြတ်နိုင်ပါ။"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 0a56eeb646031fbc71bdd8b125f6317762c70219..d80dc9bfb154e79d1cabb6874cd6323c509204bb 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "စကားဝှက်"
@@ -423,7 +423,7 @@ msgstr "စကားဝှက်အသစ်"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 67429168c145b3568f8eee48d7b26be29128d322..f5d26e3942c2384645cb5c9272fb4edbf4df04a5 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "စကားဝှက်"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "အကူအညီ"
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
index bfba4e1cd6e917482a9b69324d4dae5b15e8c90d..51443b323f3065604691278a99a65b59ec8ac709 100644
--- a/l10n/my_MM/user_webdavauth.po
+++ b/l10n/my_MM/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index fb7fcade4029ad7cdaf0c8f43781ecae5a772612..777542c0001290305d3dec181bc51e88a8110571 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "forrige år"
msgid "years ago"
msgstr "år siden"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Velg"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Velg"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Fullfør oppsetting"
msgid "web services under your control"
msgstr "web tjenester du kontrollerer"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Logg ut"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index ea77c752b34ea03fa067c546ab6e68ed9c019311..d3b6ec09dde7f2b4711d727bbd26b8b6b140b872 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +21,12 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Kunne ikke flytte %s"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
@@ -38,7 +39,7 @@ msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
#: ajax/upload.php:29
msgid ""
@@ -64,11 +65,11 @@ msgstr "Klarte ikke å skrive til disk"
#: ajax/upload.php:51
msgid "Not enough storage available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
#: ajax/upload.php:83
msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig katalog."
#: appinfo/app.php:12
msgid "Files"
@@ -120,7 +121,7 @@ msgstr "angre"
#: js/filelist.js:331
msgid "perform delete operation"
-msgstr ""
+msgstr "utfør sletting"
#: js/filelist.js:413
msgid "1 file uploading"
@@ -132,11 +133,11 @@ msgstr "filer lastes opp"
#: js/files.js:52
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' er et ugyldig filnavn."
#: js/files.js:56
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Filnavn kan ikke være tomt."
#: js/files.js:64
msgid ""
@@ -146,17 +147,17 @@ msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke ti
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
#: js/files.js:231
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr ""
+msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -164,7 +165,7 @@ msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes
#: js/files.js:277
msgid "Not enough space available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
#: js/files.js:317
msgid "Upload cancelled."
@@ -181,7 +182,7 @@ msgstr "URL-en kan ikke være tom."
#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
msgid "Error"
@@ -217,11 +218,11 @@ msgstr "{count} filer"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
#: lib/app.php:73
msgid "Unable to rename file"
-msgstr ""
+msgstr "Kan ikke gi nytt navn"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -277,7 +278,7 @@ msgstr "Fra link"
#: templates/index.php:42
msgid "Deleted files"
-msgstr ""
+msgstr "Slettet filer"
#: templates/index.php:48
msgid "Cancel upload"
@@ -285,7 +286,7 @@ msgstr "Avbryt opplasting"
#: templates/index.php:54
msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du har ikke skrivetilgang her."
#: templates/index.php:61
msgid "Nothing in here. Upload something!"
@@ -319,4 +320,4 @@ msgstr "Pågående skanning"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Oppgraderer filsystemets mellomlager..."
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 7fca6d39803889869d180f49cf19d55f56a91f53..0ff991d14d1128f0763d9bacbc3963d528fa5726 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Lagrer..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil-kryptering er aktivert."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Følgende filtyper vil ikke bli kryptert:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder følgende filtyper fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 00e13b64477352757c812ef476aab5bfc695663e..cdb5af275e92f76bd16555f2cc5e55b22c3f76a7 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,31 +32,31 @@ msgstr "Gi tilgang"
#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet."
#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Feil med konfigurering av Google Drive"
#: lib/config.php:431
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det."
#: lib/config.php:434
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det."
#: lib/config.php:437
msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index ab1517bb3f17dc83f7eda8885609946f02d8b915..bc0f67466113df8cc4fc01bc191bf8490a2e6d8c 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 1e5a285a90e7bcee62888b23a36cbbaa3e67249d..605f48efbcb50ae2570b6e16de4899a0abddfcb7 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +28,11 @@ msgstr "Kunne ikke slette %s fullstendig"
msgid "Couldn't restore %s"
msgstr "Kunne ikke gjenopprette %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "utfør gjenopprettings operasjon"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Feil"
@@ -39,31 +40,31 @@ msgstr "Feil"
msgid "delete file permanently"
msgstr "slett filer permanent"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Slett permanent"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Navn"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Slettet"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mappe"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} filer"
@@ -81,4 +82,4 @@ msgstr "Slett"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "Slettet filer"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 2c4717260acc2809872e7715f812424f5bd08d02..0d1e2a829cd212faaee7e5d8c1ead7b573f1daa1 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1b6be2e344746090f7bd62812dbaea68cd0c3428..971d77f72c3ec89ed717e1b8d620deecad20f002 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjelp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personlig"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Innstillinger"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Brukere"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apper"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP-nedlasting av avslått"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Filene må lastes ned en om gangen"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Tilbake til filer"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,75 +113,79 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
#: template.php:113
msgid "seconds ago"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index a00278adbdf82ae9ec46b3fbec8063042107e376..e19e1a0fcbd270f3df570617917545c94b44514f 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -24,15 +25,15 @@ msgstr "Lasting av liste fra App Store feilet."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
+msgstr "Autentiseringsfeil"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Ditt visningsnavn er blitt endret."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr ""
+msgstr "Kunne ikke endre visningsnavn"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -72,7 +73,7 @@ msgstr "Ugyldig forespørsel"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Admin kan ikke flytte seg selv fra admingruppen"
#: ajax/togglegroups.php:30
#, php-format
@@ -86,11 +87,11 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr ""
+msgstr "Kunne ikke oppdatere app."
#: js/apps.js:30
msgid "Update to {appversion}"
-msgstr ""
+msgstr "Oppdater til {appversion}"
#: js/apps.js:36 js/apps.js:76
msgid "Disable"
@@ -102,7 +103,7 @@ msgstr "Aktiver"
#: js/apps.js:55
msgid "Please wait...."
-msgstr ""
+msgstr "Vennligst vent..."
#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
msgid "Error"
@@ -110,60 +111,60 @@ msgstr "Feil"
#: js/apps.js:90
msgid "Updating...."
-msgstr ""
+msgstr "Oppdaterer..."
#: js/apps.js:93
msgid "Error while updating app"
-msgstr ""
+msgstr "Feil ved oppdatering av app"
#: js/apps.js:96
msgid "Updated"
-msgstr ""
+msgstr "Oppdatert"
#: js/personal.js:118
msgid "Saving..."
msgstr "Lagrer..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "slettet"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "angre"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
-msgstr ""
+msgstr "Kunne ikke slette bruker"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Slett"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig brukernavn"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av bruker"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig passord"
#: personal.php:35 personal.php:36
msgid "__language_name__"
@@ -180,36 +181,36 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde."
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+msgstr "Installasjonsadvarsel"
#: templates/admin.php:32
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulen 'fileinfo' mangler"
#: templates/admin.php:47
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr ""
+msgstr "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
#: templates/admin.php:58
msgid "Locale not working"
-msgstr ""
+msgstr "Språk virker ikke"
#: templates/admin.php:63
#, php-format
@@ -217,11 +218,11 @@ msgid ""
"This ownCloud server can't set system locale to %s. This means that there "
"might be problems with certain characters in file names. We strongly suggest"
" to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s."
#: templates/admin.php:75
msgid "Internet connection not working"
-msgstr ""
+msgstr "Ingen internettilkopling"
#: templates/admin.php:78
msgid ""
@@ -231,7 +232,7 @@ msgid ""
"remote and sending of notification emails might also not work. We suggest to"
" enable internet connection for this server if you want to have all features"
" of ownCloud."
-msgstr ""
+msgstr "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud."
#: templates/admin.php:92
msgid "Cron"
@@ -239,19 +240,19 @@ msgstr "Cron"
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Utfør en oppgave med hver side som blir lastet"
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden i ownCloud rot hvert minutt vha http."
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr ""
+msgstr "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt."
#: templates/admin.php:128
msgid "Sharing"
@@ -259,11 +260,11 @@ msgstr "Deling"
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver API for Deling"
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillat apps å bruke API for Deling"
#: templates/admin.php:142
msgid "Allow links"
@@ -275,7 +276,7 @@ msgstr "Tillat brukere å dele filer med lenker"
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr ""
+msgstr "TIllat videredeling"
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
@@ -291,22 +292,22 @@ msgstr "Tillat kun deling med andre brukere i samme gruppe"
#: templates/admin.php:168
msgid "Security"
-msgstr ""
+msgstr "Sikkerhet"
#: templates/admin.php:181
msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Tving HTTPS"
#: templates/admin.php:182
msgid ""
"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Tvinger klienter til å bruke ownCloud via kryptert tilkopling."
#: templates/admin.php:185
msgid ""
"Please connect to this ownCloud instance via HTTPS to enable or disable the "
"SSL enforcement."
-msgstr ""
+msgstr "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL."
#: templates/admin.php:195
msgid "Log"
@@ -324,11 +325,11 @@ msgstr "Mer"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,7 +337,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:11
msgid "Add your App"
@@ -356,7 +357,7 @@ msgstr "Se applikasjonens side på apps.owncloud.org"
#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
#: templates/apps.php:38
msgid "Update"
@@ -372,15 +373,15 @@ msgstr "Administratordokumentasjon"
#: templates/help.php:9
msgid "Online Documentation"
-msgstr ""
+msgstr "Online dokumentasjon"
#: templates/help.php:11
msgid "Forum"
-msgstr ""
+msgstr "Forum"
#: templates/help.php:14
msgid "Bugtracker"
-msgstr ""
+msgstr "Feilsporing"
#: templates/help.php:17
msgid "Commercial Support"
@@ -397,9 +398,9 @@ msgstr "Få dine apps til å synkronisere dine filer"
#: templates/personal.php:26
msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passord"
@@ -423,70 +424,74 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endre passord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
-msgstr ""
+msgstr "Visningsnavn"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Epost"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Din e-postadresse"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Oppi epostadressen du vil tilbakestille passordet for"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Bidra til oversettelsen"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
-msgstr ""
+msgstr "Logginn navn"
#: templates/users.php:30
msgid "Create"
msgstr "Opprett"
-#: templates/users.php:33
-msgid "Default Storage"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr "Standard lager"
+
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrenset"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Annet"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "Lager"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
-msgstr ""
+msgstr "endre visningsnavn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
-msgstr ""
+msgstr "sett nytt passord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 643c1a84bfad4012af56f3e4df70756d678fa043..7e92e2ca5b0dce0045a5fd901aae871013713843 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Klarte ikke å slette tjener-konfigurasjonen."
@@ -53,281 +57,363 @@ msgstr "Behold innstillinger?"
msgid "Cannot add server configuration"
msgstr "Kan ikke legge til tjener-konfigurasjon"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Suksess"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Feil"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Tilkoblingstest lyktes"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Tilkoblingstest mislyktes"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Bekreft sletting"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spør din system-administrator om å deaktivere en av dem."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Tjener-konfigurasjon"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Legg til tjener-konfigurasjon"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Tjener"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kan utelate protokollen, men du er påkrevd å bruke SSL. Deretter starte med ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "En hoved DN pr. linje"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Bruker DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "For anonym tilgang, la DN- og passord-feltet stå tomt."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Brukerpålogging filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Brukerliste filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppefilter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurasjon aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Sikkerhetskopierings (Replica) vert"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Bruk TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case-insensitiv LDAP tjener (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Slå av SSL-sertifikat validering"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ikke anbefalt, bruk kun for testing"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En endring tømmer bufferen."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Vis brukerens navnfelt"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP-attributen å bruke for å generere brukers ownCloud navn."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Hovedbruker tre"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "En Bruker Base DN pr. linje"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Vis gruppens navnfelt"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP-attributen å bruke for å generere gruppens ownCloud navn."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Hovedgruppe tre"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "En gruppe hoved-DN pr. linje"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "gruppe-medlem assosiasjon"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 0bdc4ebc7b0a95be907bd7ef958c7d06ab4f4b87..6228186b672966b6423f3287368469a2d72ca27c 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <espenbye@me.com>, 2012.
+# espenbye <espenbye@me.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index c5b6a57bbb9d82825326a5c5d07057acf67c0bca..bbe6f7e5afc91cb8cf4985be4c2cfb033ccd9fee 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index a20804fbfeb8deb6bf233ed23d445177451ffd2f..2a295626b154b5a7793414e54e742d87c166f067 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 4eb8d284c4d50494901250cbd98b39c399fc2167..f9b5d81ccffa9f6f6a47cbb8eac8ee219efc76eb 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index 5b2e2ed5979eb376d8b0a022c5df7fa5c20fed2a..7e7ed0e39682def72c0cb6a31892e7df3b057486 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 6905b432c8e1101f84f0ade4d4b7e4ac231c8179..978e72b2ebf14de308dbe0fe1ad82c0f326ed38f 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 3775730782dc5ca8985aa092aedbeb55fa3904ca..0eebd5d130c7b412c27304bf69c6923767ed05e3 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_versions.po b/l10n/ne/files_versions.po
index 3f57c723bc3abd10fe29f061481d69a391aaa5af..75141cb34f99aeb0088a91ddf17f7aa676d4e518 100644
--- a/l10n/ne/files_versions.po
+++ b/l10n/ne/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index bf5c92bdbfc36fff7ec93f983410910e132430e4..17b8279af6310c6bc44301e26cadc423900502ac 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 20957a953ff991844e47cccacb193614f221628b..e1e8ae4a62f49c9d14a157fbdcbf030aa0d7e396 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 871723423d8003e2110424b1e3f4d330521be557..eca44e17a0b15b2bfc50d5a33879e9bf9ed11c21 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/ne/user_webdavauth.po b/l10n/ne/user_webdavauth.po
index 64e025a6bec99cad39026ad695d31e51309f2266..d8b30a63e3597b0dfd67a099f6918dd1055be87e 100644
--- a/l10n/ne/user_webdavauth.po
+++ b/l10n/ne/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 2a620401ee084f7dce02d7b2d4c5bee400a9b113..7e9124bb1f8a253c06ef8b18fb439be87f38a299 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 19:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "vorig jaar"
msgid "years ago"
msgstr "jaar geleden"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Kies"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annuleer"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Kies"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Fout bij laden van bestandsselectie sjabloon"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nee"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Installatie afronden"
msgid "web services under your control"
msgstr "Webdiensten in eigen beheer"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Afmelden"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 1100a0517fb1f0e5f3f7e2c92556dd52d194e7ec..c7952ad45828dac17812fdb25972065938c66f0b 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\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"
@@ -217,7 +218,7 @@ msgstr "{count} bestanden"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 548a5be15bdcebd98603b1bce1decfb528fd8a77..92b7cddfd69909a108cfb8153ac6f570bfcc8e7a 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-01 01:58+0200\n"
+"PO-Revision-Date: 2013-05-31 06:00+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\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"
@@ -17,22 +18,87 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Herstelsleutel succesvol geactiveerd"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Herstelsleutel succesvol gedeactiveerd"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Wachtwoord succesvol gewijzigd."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Opslaan"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Versleuteling"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Bestandsversleuteling geactiveerd."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Herstel account wachtwoord"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Geactiveerd"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Gedeactiveerd"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Wijzig versleuteling wachtwoord herstelsleutel"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Oude herstel account wachtwoord"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Nieuwe herstel account wachtwoord"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Wijzigen wachtwoord"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Activeer wachtwoordherstel door alle bestanden met uw beheerder te delen:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "De volgende bestandstypen zullen niet worden versleuteld:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Door deze optie te activeren kunt u toegang tot uw versleutelde bestanden krijgen als u uw wachtwoord kwijt bent"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Sluit de volgende bestandstypen uit van versleuteling:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Bestandsherstel instellingen bijgewerkt"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Geen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Kon bestandsherstel niet bijwerken"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 13735200722d942d5c6041d3b6d4f9e6f48bde4f..48cf0b02cc59634bce2795724a37b05a2b115c18 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 75628354dc97ba75d328f79b850a53610c7e843f..75f66ba8f5f5e214dd38890ad771b0e748bfba27 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 944f801c1ab9bf8ac7ced3b89248d244fbbba12e..70d7161817a218c6217c5cea1c0f2e2aa0fe7908 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Kon %s niet permanent verwijderen"
msgid "Couldn't restore %s"
msgstr "Kon %s niet herstellen"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "uitvoeren restore operatie"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Fout"
@@ -39,31 +39,31 @@ msgstr "Fout"
msgid "delete file permanently"
msgstr "verwijder bestanden definitief"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Verwijder definitief"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Naam"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Verwijderd"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 map"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mappen"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 bestand"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} bestanden"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 4b1bafb81fb1246b2966bfc3aa76073781484547..83735c7ef761812a8f68dda5cf09728474286af0 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index c56862e9313c4b42630554ec9de4c03cada8401d..681b5532fd98de9a33e63dd476b294918a05dd7b 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Help"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persoonlijk"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Instellingen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Gebruikers"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Beheerder"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP download is uitgeschakeld."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Bestanden moeten één voor één worden gedownload."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Terug naar bestanden"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "kon niet worden vastgesteld"
@@ -113,72 +114,76 @@ msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
msgid "%s set the database host."
msgstr "%s instellen databaseservernaam."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Geef of een bestaand account op of het beheerdersaccount."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Er kon geen verbinding met Oracle worden bereikt"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fout: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Onjuiste commande was: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Verwijder deze gebruiker uit MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Verwijder deze gebruiker uit MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 577422c46913f68e9fe4b146f053309a3abcbccf..47b47d57df3969fb3e2ae8b89c13eb898256a0bb 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Bijgewerkt"
msgid "Saving..."
msgstr "Opslaan"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "verwijderd"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "ongedaan maken"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Verwijder"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "toevoegen groep"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Fout bij aanmaken gebruiker"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
@@ -325,11 +325,11 @@ msgstr "Meer"
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Download de apps om bestanden te synchen"
msgid "Show First Run Wizard again"
msgstr "Toon de Eerste start Wizard opnieuw"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Wachtwoord"
@@ -424,39 +424,39 @@ msgstr "Nieuw"
msgid "Change password"
msgstr "Wijzig wachtwoord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Weergavenaam"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mailadres"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Uw e-mailadres"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Taal"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Help met vertalen"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Inlognaam"
@@ -464,30 +464,34 @@ msgstr "Inlognaam"
msgid "Create"
msgstr "Creëer"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Beheer herstel wachtwoord"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Default opslag"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ongelimiteerd"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Anders"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Opslag"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "wijzig weergavenaam"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Instellen nieuw wachtwoord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Default"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e7ea1823141912af094d63e36506d5f0c2ae9294..abd7ffccfebab34e7b806f23bcbdd9472b5f6983 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\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"
@@ -17,6 +18,10 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Niet gelukt de vertalingen leeg te maken."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Verwijderen serverconfiguratie mislukt"
@@ -53,281 +58,363 @@ msgstr "Instellingen bewaren?"
msgid "Cannot add server configuration"
msgstr "Kon de serverconfiguratie niet toevoegen"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "vertaaltabel leeggemaakt"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fout"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Verbindingstest geslaagd"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Verbindingstest mislukt"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Bevestig verwijderen"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverconfiguratie"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Toevoegen serverconfiguratie"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Een Base DN per regel"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Wachtwoord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Gebruikers Login Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Gebruikers Lijst Filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "zonder een placeholder, bijv. \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Groep Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Verbindingsinstellingen"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuratie actief"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Poort"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Backup (Replica) Host"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Backup (Replica) Poort"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deactiveren hoofdserver"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Gebruik TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Schakel SSL certificaat validatie uit."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache time-to-live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in seconden. Een verandering maakt de cache leeg."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Mapinstellingen"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Gebruikers Schermnaam Veld"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Basis Gebruikers Structuur"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Een User Base DN per regel"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Attributen voor gebruikerszoekopdrachten"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optioneel; één attribuut per regel"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Groep Schermnaam Veld"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Basis Groupen Structuur"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Een Group Base DN per regel"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Attributen voor groepszoekopdrachten"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Groepslid associatie"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Speciale attributen"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Quota veld"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota standaard"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-mailveld"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Gebruikers Home map naamgevingsregel"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interne gebruikersnaam"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Interne gebruikersnaam attribuut:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Negeren UUID detectie"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID Attribuut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Test configuratie"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Help"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 90490f9dd961188f84f57796e7399c11b2c0f494..9cd0fb7d2e0e6f82db8a2fab4eb350124131d61c 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-# Richard Bos <radoeka@gmail.com>, 2012.
+# André Koot <meneer@tken.net>, 2012-2013
+# Richard Bos <radoeka@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 6ffc7836248a6e434adc0714403612a63b129ec8..02bc28361685c3f88095f0ef7d38f73a773ed0a5 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-07 18:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -70,7 +71,7 @@ msgstr "Ingen %s-ID."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr "Klarte ikkje å leggja til %s i favorittar."
+msgstr "Klarte ikkje leggja til %s i favorittar."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -79,7 +80,7 @@ msgstr "Ingen kategoriar valt for sletting."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr "Klarte ikkje å fjerna %s frå favorittar."
+msgstr "Klarte ikkje fjerna %s frå favorittar."
#: js/config.php:34
msgid "Sunday"
@@ -199,11 +200,11 @@ msgstr "førre månad"
#: js/js.js:727
msgid "{months} months ago"
-msgstr "{months) månader sidan"
+msgstr "{months} månadar sidan"
#: js/js.js:728
msgid "months ago"
-msgstr "månader sidan"
+msgstr "månadar sidan"
#: js/js.js:729
msgid "last year"
@@ -213,26 +214,30 @@ msgstr "i fjor"
msgid "years ago"
msgstr "år sidan"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Greitt"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vel"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vel"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Greitt"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -248,7 +253,7 @@ msgstr "Feil"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr "App-namnet er ikkje spesifisert."
+msgstr "Programnamnet er ikkje spesifisert."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
@@ -308,11 +313,11 @@ msgstr "Send"
#: js/share.js:178
msgid "Set expiration date"
-msgstr "Set utlaupsdato"
+msgstr "Set utløpsdato"
#: js/share.js:179
msgid "Expiration date"
-msgstr "Utlaupsdato"
+msgstr "Utløpsdato"
#: js/share.js:211
msgid "Share via email:"
@@ -364,11 +369,11 @@ msgstr "Passordverna"
#: js/share.js:577
msgid "Error unsetting expiration date"
-msgstr "Klarte ikkje å fjerna utlaupsdato"
+msgstr "Klarte ikkje fjerna utløpsdato"
#: js/share.js:589
msgid "Error setting expiration date"
-msgstr "Klarte ikkje å setja utlaupsdato"
+msgstr "Klarte ikkje setja utløpsdato"
#: js/share.js:604
msgid "Sending ..."
@@ -447,7 +452,7 @@ msgstr "Brukarar"
#: strings.php:7
msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
#: strings.php:8
msgid "Admin"
@@ -525,13 +530,13 @@ msgstr "Datamappe"
#: templates/installation.php:74
msgid "Configure the database"
-msgstr "Konfigurer databasen"
+msgstr "Set opp databasen"
#: templates/installation.php:79 templates/installation.php:91
#: templates/installation.php:102 templates/installation.php:113
#: templates/installation.php:125
msgid "will be used"
-msgstr "vil bli nytta"
+msgstr "vil verta nytta"
#: templates/installation.php:137
msgid "Database user"
@@ -561,12 +566,12 @@ msgstr "Fullfør oppsettet"
msgid "web services under your control"
msgstr "Vevtenester under din kontroll"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Logg ut"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index e817942480c368c2b2c8606624d61e7931b7f51f..3e649ef10d8511cf625609d5f344ca19934274bf 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -4,13 +4,14 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
@@ -21,12 +22,12 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet"
+msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr "Klarte ikkje å flytta %s"
+msgstr "Klarte ikkje flytta %s"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
@@ -61,7 +62,7 @@ msgstr "Manglar ei mellombels mappe"
#: ajax/upload.php:33
msgid "Failed to write to disk"
-msgstr "Klarte ikkje å skriva til disk"
+msgstr "Klarte ikkje skriva til disk"
#: ajax/upload.php:51
msgid "Not enough storage available"
@@ -161,7 +162,7 @@ msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte"
+msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
#: js/files.js:277
msgid "Not enough space available"
@@ -174,11 +175,11 @@ msgstr "Opplasting avbroten."
#: js/files.js:413
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten."
+msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
#: js/files.js:486
msgid "URL cannot be empty."
-msgstr "URL-en kan ikkje vera tom."
+msgstr "Nettadressa kan ikkje vera tom."
#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
@@ -218,11 +219,11 @@ msgstr "{count} filer"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
-msgstr "Klarte ikkje å endra filnamnet"
+msgstr "Klarte ikkje endra filnamnet"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -242,11 +243,11 @@ msgstr "maks. moglege:"
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Naudsynt for fleirfils- og mappenedlastingar."
+msgstr "Nødvendig for fleirfils- og mappenedlastingar."
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Skru på ZIP-nedlasting"
+msgstr "Slå på ZIP-nedlasting"
#: templates/admin.php:20
msgid "0 is unlimited"
@@ -308,7 +309,7 @@ msgstr "For stor opplasting"
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
#: templates/index.php:114
msgid "Files are being scanned, please wait."
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 8e3b4ed5f772430e4df9173a9e30facad8c510d4..03d96695bf52138f8d26f51d8c217cb3a8e9b706 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Lagrar …"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 444e7be0a1b41fab38e5c925ffd02a4cba6af7e4..ff8d073d4d69cb863636f9d648612dd276896177 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@ msgstr ""
#: templates/settings.php:11
msgid "Configuration"
-msgstr ""
+msgstr "Innstillingar"
#: templates/settings.php:12
msgid "Options"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 94d12c1829ea76a3d5f7983e6cb47b94401fe976..be0de366a60a80a3cbd04632e21c1b1e124de07b 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 17:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
@@ -28,12 +29,12 @@ msgstr "Send"
#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s delte mappa %s med deg"
#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s delte fila %s med deg"
#: templates/public.php:19 templates/public.php:43
msgid "Download"
@@ -41,7 +42,7 @@ msgstr "Last ned"
#: templates/public.php:40
msgid "No preview available for"
-msgstr ""
+msgstr "Inga førehandsvising tilgjengeleg for"
#: templates/public.php:50
msgid "web services under your control"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 14a63b146293eb851455ace35f17cb2204e073ab..96fe31c4038904e5aae5ed42f02e148ed4df05d1 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 14:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
@@ -20,60 +21,60 @@ msgstr ""
#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Klarte ikkje sletta %s for godt"
#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Klarte ikkje gjenoppretta %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
-msgstr ""
+msgstr "utfør gjenoppretting"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Feil"
#: js/trash.js:34
msgid "delete file permanently"
-msgstr ""
+msgstr "slett fila for godt"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Slett for godt"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Namn"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
-msgstr ""
+msgstr "Sletta"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mappe"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} filer"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Ingenting her. Papirkorga di er tom!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr ""
+msgstr "Gjenopprett"
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
@@ -81,4 +82,4 @@ msgstr "Slett"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "Sletta filer"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 0a5ad71179639aa580749b38ec6f0546c3b678dd..4de20b084400d38ed5170b3112e6cb7ffda70f13 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
@@ -20,38 +21,38 @@ msgstr ""
#: ajax/rollbackVersion.php:15
#, php-format
msgid "Could not revert: %s"
-msgstr ""
+msgstr "Klarte ikkje å tilbakestilla: %s"
#: history.php:40
msgid "success"
-msgstr ""
+msgstr "vellukka"
#: history.php:42
#, php-format
msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Tilbakestilte fila %s til utgåva %s"
#: history.php:49
msgid "failure"
-msgstr ""
+msgstr "feil"
#: history.php:51
#, php-format
msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Klarte ikkje tilbakestilla fila %s til utgåva %s"
#: history.php:69
msgid "No old versions available"
-msgstr ""
+msgstr "Ingen eldre utgåver tilgjengelege"
#: history.php:74
msgid "No path specified"
-msgstr ""
+msgstr "Ingen sti gjeve"
#: js/versions.js:6
msgid "Versions"
-msgstr ""
+msgstr "Utgåver"
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 9521606544ab33c0d7905314e086adde90735234..e28aaf68512f3f350ac2ede11f421fffdca70d35 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjelp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personleg"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Innstillingar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Brukarar"
-#: app.php:398
+#: app.php:406
msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrer"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +114,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index ac35cb7aedce8cc2b8d688d1913f911d1aef6f8a..8fd884206149c6b12568ffa0d659f88be19ba4a3 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -4,13 +4,14 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -29,11 +30,11 @@ msgstr "Autentiseringsfeil"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr "Visningsnamnet ditt er endra."
+msgstr "Visingsnamnet ditt er endra."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr "Klarte ikkje å endra visningsnamnet"
+msgstr "Klarte ikkje endra visingsnamnet"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -41,11 +42,11 @@ msgstr "Gruppa finst allereie"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr "Klarte ikkje å leggja til gruppa"
+msgstr "Klarte ikkje leggja til gruppa"
#: ajax/enableapp.php:11
msgid "Could not enable app. "
-msgstr "Klarte ikkje å aktivera app-en."
+msgstr "Klarte ikkje slå på programmet."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -61,7 +62,7 @@ msgstr "Klarte ikkje å sletta gruppa"
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr "Klarte ikkje å sletta brukaren"
+msgstr "Klarte ikkje sletta brukaren"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -78,16 +79,16 @@ msgstr "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa"
#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
-msgstr "Klarte ikkje å leggja til brukaren til gruppa %s"
+msgstr "Klarte ikkje leggja til brukaren til gruppa %s"
#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
-msgstr "Klarte ikkje å fjerna brukaren frå gruppa %s"
+msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr "Klarte ikkje å oppdatera app-en."
+msgstr "Klarte ikkje oppdatera programmet."
#: js/apps.js:30
msgid "Update to {appversion}"
@@ -125,44 +126,44 @@ msgstr "Oppdatert"
msgid "Saving..."
msgstr "Lagrar …"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "sletta"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "angra"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
-msgstr "Klarte ikkje å fjerna brukaren"
+msgstr "Klarte ikkje fjerna brukaren"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppestyrar"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Slett"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "legg til gruppe"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Du må oppgje eit gyldig brukarnamn"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Feil ved oppretting av brukar"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Du må oppgje eit gyldig passord"
@@ -206,7 +207,7 @@ msgstr "Modulen «fileinfo» manglar"
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar."
+msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
#: templates/admin.php:58
msgid "Locale not working"
@@ -218,7 +219,7 @@ msgid ""
"This ownCloud server can't set system locale to %s. This means that there "
"might be problems with certain characters in file names. We strongly suggest"
" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s."
+msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -232,7 +233,7 @@ msgid ""
"remote and sending of notification emails might also not work. We suggest to"
" enable internet connection for this server if you want to have all features"
" of ownCloud."
-msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
+msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
#: templates/admin.php:92
msgid "Cron"
@@ -260,7 +261,7 @@ msgstr "Deling"
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Skru på API-et for deling"
+msgstr "Slå på API-et for deling"
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
@@ -307,7 +308,7 @@ msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
msgid ""
"Please connect to this ownCloud instance via HTTPS to enable or disable the "
"SSL enforcement."
-msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga."
+msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga."
#: templates/admin.php:195
msgid "Log"
@@ -325,11 +326,11 @@ msgstr "Meir"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Utgåve"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -349,11 +350,11 @@ msgstr "Fleire app-ar"
#: templates/apps.php:28
msgid "Select an App"
-msgstr "Vel ein applikasjon"
+msgstr "Vel eit program"
#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
-msgstr "Sjå applikasjonssida på apps.owncloud.com"
+msgstr "Sjå programsida på apps.owncloud.com"
#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -400,7 +401,7 @@ msgstr "Få app-ar som kan synkronisera filene dine"
msgid "Show First Run Wizard again"
msgstr "Vis Oppstartvegvisaren igjen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passord"
@@ -410,7 +411,7 @@ msgstr "Passordet ditt er endra"
#: templates/personal.php:39
msgid "Unable to change your password"
-msgstr "Klarte ikkje å endra passordet"
+msgstr "Klarte ikkje endra passordet"
#: templates/personal.php:40
msgid "Current password"
@@ -424,39 +425,39 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endra passord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
-msgstr "Visningsnamn"
+msgstr "Visingsnamn"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Di epost-adresse"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn e-postadressa di for å aktivera passordgjenoppretting"
+msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hjelp oss å omsetja"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Innloggingsnamn"
@@ -464,30 +465,34 @@ msgstr "Innloggingsnamn"
msgid "Create"
msgstr "Lag"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standardlagring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ubegrensa"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Anna"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
-msgstr "endra visningsnamn"
+msgstr "endra visingsnamn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "lag nytt passord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 8e326e3829fd7b244b4888e278cc545439c5be65..1be6b4e2852697046ec4bd1b854db9ad274edda3 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 07:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Feil"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 1b5e93f18ca596f21d2f58475016e5489c4de618..37bb2ea522ad719f5a8209963123e1ee6d42dece 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 10:50+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
@@ -19,15 +20,15 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV-autentisering"
#: templates/settings.php:4
msgid "URL: http://"
-msgstr ""
+msgstr "Nettadresse: http://"
#: templates/settings.php:7
msgid ""
"ownCloud will send the user credentials to this URL. This plugin checks the "
"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
"credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "ownCloud sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 7e55cfc676040d93fc4269e172ca82eaeb534d3a..0281a3811367ee9d0bc331a18a0d519635228517 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "an passat"
msgid "years ago"
msgstr "ans a"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "D'accòrdi"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Causís"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annula"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Causís"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Òc"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "D'accòrdi"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Configuracion acabada"
msgid "web services under your control"
msgstr "Services web jos ton contraròtle"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Sortida"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 3ce89e5ae390fe07ac03bfb864dc864eaeb9d445..e01f381dc5ffccf817aa34d29b220c85afa9e27c 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 3fbf4c0e83693ce8d0ea9f81ba81e6af8c554c86..0277916620b5c4aeaf334a34d45e5f8d1c472aa8 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Enregistra..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index d4da7a4ee88cc40cd9c0adcc36973fbb00817047..fddd4f32dda88eb9847852bd856b319cf1e64362 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 9f1de7e3bd1b5a7248ca71a97e90fd84b254b85c..01588c6a8757347fc439fc8475eec62f11086970 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 70bce2472e74a372128478e22f27c6308c080808..2794272c013c47ffbb428bc32fd5209849b56008 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Error"
@@ -39,31 +39,31 @@ msgstr "Error"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index 0c9402555233491d6e416fb6d9aa884d48137a9b..d1964f5cfaa8019f23fe402475e70067c8bbb1f1 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 68de31380424c4e60fb837771c6937eb4c040066..bcefe3b1d74042c2f16158b80d16b587da4fbe9a 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configuracion"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usancièrs"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Avalcargar los ZIP es inactiu."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Los fichièrs devan èsser avalcargats un per un."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Torna cap als fichièrs"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 69c7ff6ab76e639ac31ae0a349087ecd6229feb6..027b3d41795376674d66dc2ca87cfd5b896dbc39 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Enregistra..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "escafat"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "defar"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grops"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grop Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Escafa"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Mai d'aquò"
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Senhal"
@@ -423,39 +423,39 @@ msgstr "Senhal novèl"
msgid "Change password"
msgstr "Cambia lo senhal"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Corrièl"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Ton adreiça de corrièl"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Lenga"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ajuda a la revirada"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Autres"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 4da5e8266b156960d73da0d0294e68b6f49e8f93..42404d1acfb6b9dc47b7af6d74a8af3e2d8466a2 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Senhal"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 28e19ba92c01ca3314bdd576556358c0dce0fa1e..13f4be6160241ece29d5e6e9d958ce22ad6753c1 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index ea1cd8ebbc988db3075124afac7b7ce502f2ef2f..accc96f80cecab82a844c07355e9d10b2a957554 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -212,26 +214,30 @@ msgstr "w zeszłym roku"
msgid "years ago"
msgstr "lat temu"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Wybierz"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Anuluj"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Wybierz"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Błąd podczas ładowania pliku wybranego szablonu"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nie"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -401,11 +407,11 @@ msgid ""
"The link to reset your password has been sent to your email.<br>If you do "
"not receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a."
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
@@ -560,12 +566,12 @@ msgstr "Zakończ konfigurowanie"
msgid "web services under your control"
msgstr "Kontrolowane serwisy"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Wyloguj"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 3316033db849391f3d20a4dc6266ca59f13a2756..ad1467f6580eeacb9b5a4aee98673a305ab96900 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "Ilość plików: {count}"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 7fd0d19e5c7bfc3ea466ba84fe4fec80f444dbfb..5c3311df32ba7e3c5cc7f92b0a306ae1de99e9fb 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Zmiana hasła udana."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Nie można zmienić hasła. Może stare hasło nie było poprawne."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Zapisywanie..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Szyfrowanie"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Szyfrowanie plików jest włączone"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Odzyskiwanie hasła konta"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Włączone"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Wyłączone"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Zmiana klucza szyfrowania haseł odzyskiwania:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Stare hasło odzyskiwania"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Nowe hasło odzyskiwania"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Zmień hasło"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Włączyć hasło odzyskiwania przez udostępnianie wszystkich plików z administratorem:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Poniższe typy plików nie będą szyfrowane:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Wyłącz poniższe typy plików z szyfrowania:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Ustawienia odzyskiwania plików zmienione"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nic"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Nie można zmienić pliku odzyskiwania"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index d363de4780ff58c834658b178fd6fd7a20599726..11491689a2ebaeb00446a506a112dc69c3b34daa 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Ostrzeżenie:</b> Wsparcie dla Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index e97f578322f32d156e39fdbf33958b8facab1a72..a72cd5421d03a768f1a00157ee951e696ef416c5 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 48d0debe7fc3c46f59cb91bf49bdb0f4d3e6fdca..32ea27e1c974a66abfa833bd2c2ba34dc99015b0 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Nie można trwale usunąć %s"
msgid "Couldn't restore %s"
msgstr "Nie można przywrócić %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "wykonywanie operacji przywracania"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Błąd"
@@ -39,31 +39,31 @@ msgstr "Błąd"
msgid "delete file permanently"
msgstr "trwale usuń plik"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nazwa"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Usunięte"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 folder"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "Ilość folderów: {count}"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 plik"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "Ilość plików: {count}"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index f06438de5b69bd9e2ec1e0a363ad92b389682b66..897cae06adf82179d4d7a705e7c7ab4175eeac3d 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index db80af0529977c999f9886ca64b4727efedb6a25..bcb4e58f74095173b307fa2f56321c67c6ea6d0f 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoc"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobiste"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Użytkownicy"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikacje"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrator"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Pobieranie ZIP jest wyłączone."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Pliki muszą zostać pobrane pojedynczo."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Wróć do plików"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nie może zostać znaleziony"
@@ -113,72 +114,76 @@ msgstr "%s nie można używać kropki w nazwie bazy danych"
msgid "%s set the database host."
msgstr "%s ustaw hosta bazy danych."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Należy wprowadzić istniejące konto użytkownika lub administratora."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Nie można ustanowić połączenia z bazą Oracle"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Błąd DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Niepoprawna komenda: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Użytkownik MySQL '%s'@'localhost' już istnieje"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Usuń tego użytkownika z MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Użytkownik MySQL '%s'@'%%t' już istnieje"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Usuń tego użytkownika z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s."
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 111fad7ad06240ce5c671a01b306eed1bf3c429c..0f7d1b635730d462011f4ecaaffb26b749d67a89 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +30,7 @@ msgstr "Błąd uwierzytelniania"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Twoje wyświetlana nazwa została zmieniona."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
@@ -124,44 +126,44 @@ msgstr "Zaktualizowano"
msgid "Saving..."
msgstr "Zapisywanie..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "usunięto"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "cofnij"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nie można usunąć użytkownika"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupy"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Usuń"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "dodaj grupę"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Należy podać prawidłową nazwę użytkownika"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Błąd podczas tworzenia użytkownika"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
@@ -324,11 +326,11 @@ msgstr "Więcej"
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +401,7 @@ msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
msgid "Show First Run Wizard again"
msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Hasło"
@@ -423,39 +425,39 @@ msgstr "Nowe hasło"
msgid "Change password"
msgstr "Zmień hasło"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Wyświetlana nazwa"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Twój adres e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Język"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Pomóż w tłumaczeniu"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Login"
@@ -463,30 +465,34 @@ msgstr "Login"
msgid "Create"
msgstr "Utwórz"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Odzyskiwanie hasła administratora"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Magazyn domyślny"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Bez limitu"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Inne"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Magazyn"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "zmień wyświetlaną nazwę"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ustaw nowe hasło"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index c1425a6570edc232178aceca581ef458efc8bf76..7b17734c312fff3f2b490313e01f844bbf9f490d 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Nie udało się wyczyścić mapowania."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Nie można usunąć konfiguracji serwera"
@@ -53,281 +58,363 @@ msgstr "Zachować ustawienia?"
msgid "Cannot add server configuration"
msgstr "Nie można dodać konfiguracji serwera"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Mapoanie wyczyszczone"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukces"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Błąd"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test połączenia udany"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Test połączenia nie udany"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potwierdź usunięcie"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Konfiguracja servera"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Dodaj konfigurację servera"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Baza DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Jedna baza DN na linię"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Użytkownik DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Hasło"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtr logowania użytkownika"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista filtrów użytkownika"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupa filtrów"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Konfiguracja połączeń"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguracja archiwum"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Kopia zapasowa (repliki) host"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dać opcjonalnie hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Kopia zapasowa (repliki) Port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Wyłącz serwer główny"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Po włączeniu, ownCloud tylko połączy się z serwerem repliki."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Użyj TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Wielkość liter serwera LDAP (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Niezalecane, użyj tylko testowo."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Przechowuj czas życia"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ustawienia katalogów"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Pole wyświetlanej nazwy użytkownika"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Drzewo bazy użytkowników"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Jeden użytkownik Bazy DN na linię"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Szukaj atrybutów"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcjonalnie; jeden atrybut w wierszu"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Pole wyświetlanej nazwy grupy"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Drzewo bazy grup"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Jedna grupa bazy DN na linię"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Grupa atrybutów wyszukaj"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Członek grupy stowarzyszenia"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Specjalne atrybuty"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Pole przydziału"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Przydział domyślny"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "w bajtach"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Reguły nazewnictwa folderu domowego użytkownika"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Wewnętrzna nazwa użytkownika"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Zastąp wykrywanie UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atrybuty UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Mapowanie użytkownika LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Czyść Mapowanie użytkownika LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Czyść Mapowanie nazwy grupy LDAP"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Konfiguracja testowa"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 437dc1175dacc711e32645ee92ab72551a5cd9a9..0f5ded49b5074e9efa2e80bceaed5869e748b6e9 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
-# Marcin Małecki <gerber@tkdami.net>, 2012.
+# bbartlomiej <bbartlomiej@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012
+# Marcin Małecki <gerber@tkdami.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 39727ca3bad8467f4f1b278c7e5f61b732b6932d..76a2a7cbbf7fe135f62b010bfa7f4133dded603b 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 8e524496642b6e56201af77d9017195929ada877..be28fc5ba390cbb7d03f7ca685e93b2d963a6482 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
index 13ec81b2fa52b2cbacf5d105da444582ea580410..6b66a61ef662f2a864e9e033f42eab1ffde90277 100644
--- a/l10n/pl_PL/files_encryption.po
+++ b/l10n/pl_PL/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index aec6c07a33f401d635c00e9e44ab6153d2638a42..be11b7a02683dc07094a5bda3aa751e50245d6ec 100644
--- a/l10n/pl_PL/files_external.po
+++ b/l10n/pl_PL/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-23 23:58+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_sharing.po b/l10n/pl_PL/files_sharing.po
index 6bd035fa98c10a6455f216441eca58de45f71f4d..c8bd08a2eaecc5ea25b4b3d347537edc7623bd52 100644
--- a/l10n/pl_PL/files_sharing.po
+++ b/l10n/pl_PL/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
index 7920003d18cd3d73b01fb3610930bbf6a598f2b4..e6ecf010e7703c93325b73d4ce984734b229898d 100644
--- a/l10n/pl_PL/files_trashbin.po
+++ b/l10n/pl_PL/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index f20407f561a4ce3ab3be4c5a0440da824c13de47..d6ce265c2afd3df538aeb548dff3b4ca1664fb47 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index d30c8af65263eab644413de4e71d00ac79df06ba..008b5aca83e804cf57a67729d3165c09dd05bc30 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.po
@@ -7,57 +7,57 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 6624c31b203531649842866ac762507598c6badb..68a0e23721f235484ac3f0955b0966748cb4febe 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,39 +423,39 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 9d3f142fb47f23ab1a2a6eb77d05b62812731ddc..242252ed0e4041d7d54ea8989405e862e084a96e 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 8056a470e9904c6d6ea615f0ede9b8e3db69cef1..2ac39a462117cdc174dc76900392873b9d04ba4b 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 21467c1e4d4b0dc4ba98c92e5c58e4dc379c987c..baa7132956c8ae7636159a7a1966d3c2e1675181 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 00:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escolha"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escolha"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Template selecionador Erro ao carregar arquivo"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Não"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Concluir configuração"
msgid "web services under your control"
msgstr "serviços web sob seu controle"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 10892d43027542b65d74fb5047891c60eea2591e..7a4deb445f2f2f91128fc04289d42d9207f0621b 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} arquivos"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 76932c4a277c406812ee823ffc73cad749b0af41..406cccd3c9dced72c4d957e7e606d97d0ec723ca 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-01 01:58+0200\n"
+"PO-Revision-Date: 2013-05-31 12:00+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Recuperação de chave habilitada com sucesso"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Recuperação de chave desabilitada com sucesso"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Senha alterada com sucesso."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Não foi possível alterar a senha. Talvez a senha antiga não estava correta."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Salvando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Criptografia"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "A criptografia de arquivos está ativada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Recuperar a senha da conta"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Habilidado"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Mudar a criptografia de chave de recuperação de senhas:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Recuperação de senha de conta antiga"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Senha Nova da conta de Recuperação"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Trocar Senha"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes tipos de arquivo não serão criptografados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir os seguintes tipos de arquivo da criptografia:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Configurações de recuperação de arquivo atualizado"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nada"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Não foi possível atualizar a recuperação de arquivos"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 2ff8ade49decc978aa3df1534b56e6dd528e3260..5ec6ee8a8a54fb7179331394b48b7b1a3519e58e 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 12:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index cbd0b6110f251ecc910b7ce488b214a872ea0a3d..6fa030aecfdc3ffe43a8d5566adf4d97e585f12b 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 8336eefd7e7c2e236a64fb79483867462dd426db..a879b7924b423ee748c88c444ae90d860f4eee77 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Não foi possível excluir %s permanentemente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "realizar operação de restauração"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Erro"
@@ -39,31 +39,31 @@ msgstr "Erro"
msgid "delete file permanently"
msgstr "excluir arquivo permanentemente"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Excluído"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 pasta"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 arquivo"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} arquivos"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 133e452f03e3637d67551c58cdbf1c29c432a840..8da66a76aac450bbdf6b5921e6127be4c4c99ba2 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index d2ecaa02167c5c50397f05bfb0c10e3637c90188..2946438dba55e48793df92d24b55452c8def7d22 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pessoal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ajustes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuários"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicações"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Download ZIP está desligado."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Arquivos precisam ser baixados um de cada vez."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Voltar para Arquivos"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "não pôde ser determinado"
@@ -113,72 +114,76 @@ msgstr "%s você não pode usar pontos no nome do banco de dados"
msgid "%s set the database host."
msgstr "%s defina o host do banco de dados."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Você precisa inserir uma conta existente ou o administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Conexão Oracle não pode ser estabelecida"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erro no BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Comando ofensivo era: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O usuário MySQL '%s'@'localhost' já existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Derrubar este usuário do MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuário MySQL '%s'@'%%' já existe"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Derrube este usuário do MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9bd9a0bb7f41620c8d4b08d200649f965cae7d76..721a969b1c0ff248db34f2f2991f10d5f1c00e29 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 11:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Atualizado"
msgid "Saving..."
msgstr "Salvando..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "excluído"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "desfazer"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Impossível remover usuário"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Excluir"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "adicionar grupo"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Forneça um nome de usuário válido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Erro ao criar usuário"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
@@ -325,11 +325,11 @@ msgstr "Mais"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Faça com que os apps sincronize seus arquivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar este Assistente de novo"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Senha"
@@ -424,39 +424,39 @@ msgstr "Nova senha"
msgid "Change password"
msgstr "Alterar senha"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nome de Exibição"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Seu endereço de e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome de Login"
@@ -464,30 +464,34 @@ msgstr "Nome de Login"
msgid "Create"
msgstr "Criar"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperação da Senha do Administrador"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "alterar nome de exibição"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "definir nova senha"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 04273762bd84a85f6a3c9e5899c916f8e639acdc..ae1906c7ede102097db88b9ef5168044888b7fd9 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Falha ao limpar os mapeamentos."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Falha ao deletar a configuração do servidor"
@@ -53,281 +58,363 @@ msgstr "Manter ajustes?"
msgid "Cannot add server configuration"
msgstr "Impossível adicionar a configuração do servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "mapeamentos limpos"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sucesso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Teste de conexão bem sucedida"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Teste de conexão falhou"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar Exclusão"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você deverá experienciar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuração de servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Adicionar Configuração de Servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Uma base DN por linha"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Usuário"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Senha"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de Login de Usuário"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro de Lista de Usuário"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define filtro a ser aplicado ao obter usuários."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de Grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar ao obter grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Configurações de Conexão"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuração ativa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Quando não marcada, esta configuração será ignorada."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Servidor de Backup (Réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porta do Backup (Réplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desativar Servidor Principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Quando ativado, ownCloud somente se conectará ao servidor de réplica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sensível à caixa alta (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desligar validação de certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, use somente para testes."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma mudança esvaziará o cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Configurações de Diretório"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo Nome de Exibição de Usuário"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Árvore de Usuário Base"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Um usuário-base DN por linha"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de Busca de Usuário"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; um atributo por linha"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo Nome de Exibição de Grupo"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Árvore de Grupo Base"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Um grupo-base DN por linha"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de Busca de Grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associação Grupo-Membro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos Especiais"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo de Cota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cota Padrão"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo de Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regra para Nome da Pasta Pessoal do Usuário"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome de usuário interno"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituídas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. "
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo Interno de Nome de Usuário:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Substituir detecção UUID"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Usuário-LDAP Mapeamento de Usuário"
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensíveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Teste de Configuração"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index c68169faea49ab228acd0f61599f658e8bb700b8..ef503e227b11e50c88c353e6d9449f96f072da8f 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-# <thoriumbr@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013
+# thoriumbr <thoriumbr@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 29ffcb6e7d87f82bcf80ddf031495e680f2f2412..cb533c18d2c8526a9f3f2ad148bcd7640b1ffcab 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# bmgmatias <bmgmatias@gmail.com>, 2013
# Mouxy <daniel@mouxy.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 16:40+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: bmgmatias <bmgmatias@gmail.com>\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"
@@ -213,26 +214,30 @@ msgstr "ano passado"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escolha"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escolha"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Erro ao carregar arquivo do separador modelo"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Não"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +566,12 @@ msgstr "Acabar instalação"
msgid "web services under your control"
msgstr "serviços web sob o seu controlo"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponível. Tenha mais informações como actualizar."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index dd8b0a58869f3070a823ee8e1e74d430eede9db6..c0f7e43c7ebd622c7c429f91c3eb3ceae4fbcf4f 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# bmgmatias <bmgmatias@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: bmgmatias <bmgmatias@gmail.com>\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"
@@ -217,7 +218,7 @@ msgstr "{count} ficheiros"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index d8cfa5891f79835fadc3de46480c11abbe7c2137..0cba5c44e3850714fc6b20045b6d2a32c47ec97a 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Password alterada com sucesso."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "A guardar..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Encriptação"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "A encriptação de ficheiros está ligada"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Activado"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Mudar a Password"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes ficheiros não serão encriptados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir da encriptação os seguintes tipos de ficheiro:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenhum"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 57de8c823efa9116493afcbfda80cb5bda8d3547..92224eb30cbd31d70c0b807f19968fd6e7e0d5f8 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 16:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 91d49b0b9a3212708e3325ad37317f5349db877c..71503f3f05963467ea9ffafc2c41959d364883d6 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index bc0ceb89d58b53440e186165e40701b8fc917e78..bbc31c3a3fe5c2e3b3bb6b1958b6801d59bedb08 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Não foi possível eliminar %s de forma permanente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "executar a operação de restauro"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Erro"
@@ -39,31 +39,31 @@ msgstr "Erro"
msgid "delete file permanently"
msgstr "Eliminar permanentemente o(s) ficheiro(s)"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Apagado"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 pasta"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ficheiro"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ficheiros"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 7cfc0d4b7fa571d36a036b5b3cc0d35c17f66bd0..07264486f6a61883791e758a7bd875c89dba70a1 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 73f120fd81ceb8ae1ece8714ae307458823b56fc..f1c8b731d78df2616e04d676a9f7a64bfd9680fa 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pessoal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configurações"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utilizadores"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicações"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Descarregamento em ZIP está desligado."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros precisam de ser descarregados um por um."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Voltar a Ficheiros"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "Não foi possível determinar"
@@ -113,72 +114,76 @@ msgstr "%s não é permitido utilizar pontos (.) no nome da base de dados"
msgid "%s set the database host."
msgstr "%s defina o servidor da base de dados (geralmente localhost)"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de utilizador/password do PostgreSQL inválido"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Precisa de introduzir uma conta existente ou de administrador"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de utilizador/password do Oracle inválida"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Não foi possível estabelecer a ligação Oracle"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome de utilizador/password do MySQL inválida"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erro na BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "O comando gerador de erro foi: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Eliminar este utilizador do MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "O utilizador '%s'@'%%' do MySQL já existe"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Eliminar este utilizador do MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de utilizador/password do Oracle inválida"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de utilizador/password do MySQL é inválido: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor verifique <a href='%s'>installation guides</a>."
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index fada0ab8d799c2aad9c0435d8a54f6950c1834dc..14686edfb0d0fd1d46a2ddc17650c4702ea1f0ca 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# bmgmatias <bmgmatias@gmail.com>, 2013
# Mouxy <daniel@mouxy.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 16:40+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: bmgmatias <bmgmatias@gmail.com>\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"
@@ -137,16 +138,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Não foi possível remover o utilizador"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eliminar"
@@ -154,15 +155,15 @@ msgstr "Eliminar"
msgid "add group"
msgstr "Adicionar grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Um nome de utilizador válido deve ser fornecido"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Erro a criar utilizador"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Uma password válida deve ser fornecida"
@@ -325,11 +326,11 @@ msgstr "Mais"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
msgid "Show First Run Wizard again"
msgstr "Mostrar novamente Wizard de Arranque Inicial"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Password"
@@ -424,39 +425,39 @@ msgstr "Nova palavra-chave"
msgid "Change password"
msgstr "Alterar palavra-chave"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nome público"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "O seu endereço de email"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome de utilizador"
@@ -464,30 +465,34 @@ msgstr "Nome de utilizador"
msgid "Create"
msgstr "Criar"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperar password de administrador"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "modificar nome exibido"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "definir nova palavra-passe"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index d5ad8a47f579438798f25809267a2ef1ac55c2d5..dbe72a43945e08bb1fe7ebce07529c384ab480de 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Erro ao eliminar as configurações do servidor"
@@ -53,281 +57,363 @@ msgstr "Manter as definições?"
msgid "Cannot add server configuration"
msgstr "Não foi possível adicionar as configurações do servidor."
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sucesso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Teste de conecção passado com sucesso."
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Erro no teste de conecção."
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Deseja realmente apagar as configurações de servidor actuais?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar a operação de apagar"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configurações do servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Adicionar configurações do servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Anfitrião"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Uma base DN por linho"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN do utilizador"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "O DN to cliente "
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Password"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de login de utilizador"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Utilizar filtro"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtrar por grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defina o filtro a aplicar, ao recuperar grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Definições de ligação"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuração activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Se não estiver marcada, esta definição não será tida em conta."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Servidor de Backup (Réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD "
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porta do servidor de backup (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desactivar servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de réplicas."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Não utilize para adicionar ligações LDAP, irá falhar!"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desligar a validação de certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, utilizado apenas para testes!"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache do tempo de vida dos objetos no servidor"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma alteração esvazia a cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Definições de directorias"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Mostrador do nome de utilizador."
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base da árvore de utilizadores."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Uma base de utilizador DN por linha"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Utilizar atributos de pesquisa"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; Um atributo por linha"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Mostrador do nome do grupo."
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base da árvore de grupos."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Uma base de grupo DN por linha"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de pesquisa de grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associar utilizador ao grupo."
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota padrão"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo de email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regra da pasta inicial do utilizador"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testar a configuração"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index ba3adcee8647bd628445ec4b794a5bb5c5097633..e7e520a00afa40188b17c111471149e5300a9185 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <daniel@mouxy.net>, 2012-2013.
-# Helder Meneses <helder.meneses@gmail.com>, 2012.
+# Mouxy <daniel@mouxy.net>, 2012-2013
+# Helder Meneses <helder.meneses@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index a5db03c655c3f8c5f5e8085bb4831405bfa8ef97..b73ffd596227d9ed0aef602f3797959b73287b83 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "ultimul an"
msgid "years ago"
msgstr "ani în urmă"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Alege"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Anulare"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Alege"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nu"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Finalizează instalarea"
msgid "web services under your control"
msgstr "servicii web controlate de tine"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Ieșire"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index c9651266b3fda44d74e594bcb2a50cd188c33d31..37d437a7e95ea388d48f662030a20fd38cf18a4e 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 91a23afb23d2db3ee393dda83e4a960e9b5e00bc..b3f31e838719ca40d3d936034e74732a2551957b 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Se salvează..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Încriptare"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Niciuna"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 1823f0d97d41f99facecbbd6ab9696a663b433c7..fec3d4c6acbfd51bddec35236ab2699ec6578974 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index c6b95b107082091800fc7f382b223b02882499f3..da3c59ddf7ad1e5bb4ac60c7a78cae099dd38013 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0691654cd6745f9dfcd912d596d6c5da31ac4b88..524c8b2c1ce8c08dafb13271a3fa9b998aa5ae1f 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Eroare"
@@ -39,31 +39,31 @@ msgstr "Eroare"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Stergere permanenta"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Nume"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 folder"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} foldare"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fisier"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} fisiere"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 4ae67ab2bc69a347f7d4d77823b1ee622aa5f6a5..07ce3897b263a053f35bb3c8958cb722b3f147a3 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 7d85c7044f42777ca166d3ce5bcdd8857f0a0a56..d3a5946a1bb3e8786b90a3d7db014831c0b7d9e6 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajutor"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Setări"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utilizatori"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicații"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Descărcarea ZIP este dezactivată."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Fișierele trebuie descărcate unul câte unul."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Înapoi la fișiere"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nu poate fi determinat"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 28af7d896f5443e6caf3b0f3f6efe73bb1b44738..3bcdb939b06ac4bed277b96b12e54edddc74c579 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Se salvează..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "șters"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "Anulează ultima acțiune"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Șterge"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "Mai mult"
msgid "Less"
msgstr "Mai puțin"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Versiunea"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parolă"
@@ -423,39 +423,39 @@ msgstr "Noua parolă"
msgid "Change password"
msgstr "Schimbă parola"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Adresa ta de email"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Limba"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Ajută la traducere"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Crează"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Stocare implicită"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Nelimitată"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Altele"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Stocare"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 9dab61a2a4bc9980c7040874b471eeec8073f93a..c5709c9e502404bfbbdaf884e7189b7984b88219 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Eroare"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Gazdă"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN de bază"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un Base DN pe linie"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN al utilizatorului"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parolă"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtrare după Nume Utilizator"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtrarea după lista utilizatorilor"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "fără substituenți, d.e. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Fitrare Grup"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definește filtrele care se aplică, când se preiau grupurile."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Portul"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Utilizează TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP insensibil la majuscule (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Oprește validarea certificatelor SSL "
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nu este recomandat, a se utiliza doar pentru testare."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "în secunde. O schimbare curăță memoria tampon."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Câmpul cu numele vizibil al utilizatorului"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Arborele de bază al Utilizatorilor"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un User Base DN pe linie"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Câmpul cu numele grupului"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Arborele de bază al Grupurilor"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un Group Base DN pe linie"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asocierea Grup-Membru"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "în octeți"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajutor"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 637e3bf026950670e92bf3d747c6d56a471f3b3d..7c28a3a2af761105d850b06e4205398b71875ad9 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dumitru Ursu <>, 2013.
-# <laur.cristescu@gmail.com>, 2012.
+# Dimon Pockemon <>, 2013
+# laurentiucristescu <laur.cristescu@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 22276bcd58090395b4e198cd1dca2c6ec414a716..a36463e09d5329b8d78b27b18511d4945d34f3a7 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -5,13 +5,14 @@
# Translators:
# foool <andrglad@mail.ru>, 2013
# Vyacheslav Muranov <s@neola.ru>, 2013
+# Langaru <langaru@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 19:20+0000\n"
-"Last-Translator: foool <andrglad@mail.ru>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -214,26 +215,30 @@ msgstr "в прошлом году"
msgid "years ago"
msgstr "несколько лет назад"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ок"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Выбрать"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Отменить"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Выбрать"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Ошибка при загрузке файла выбора шаблона"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Нет"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ок"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -562,12 +567,12 @@ msgstr "Завершить установку"
msgid "web services under your control"
msgstr "веб-сервисы под вашим управлением"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Выйти"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 05c45719904290450c48f729d0233d123b1da96a..3c8d873ceb7a1f12bcbd730ffd496225c4c1ddbf 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index a43bdd216ccb68f09447f3dd73e840eeba53439d..3cb93ae3108861c9965c2b04ddd2cb5c9a39eed5 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ант По <du6egub@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Пароль изменен удачно."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Невозможно изменить пароль. Возможно старый пароль не был верен."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Сохранение..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Шифрование"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Шифрование файла включено."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Восстановление пароля учетной записи"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Включено"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Отключено"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Изменить шифрование пароля ключа восстановления:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Старое Восстановление пароля учетной записи"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Новое Восстановление пароля учетной записи"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Изменить пароль"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "Включить восстановление пароля путем доступа Вашего администратора ко всем файлам"
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Следующие типы файлов не будут зашифрованы:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Исключить следующие типы файлов из шифрованных:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Настройки файла восстановления обновлены"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Нет новостей"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Невозможно обновить файл восстановления"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index e418fb322cc0a02f3827cbfcfbd5409d95bc9e08..bd2a52616df9415894add07a41886b2de238e26d 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 0e1c7422f8e64b8d07e1740b3b92ef9a5ebd075f..26b75dfce7c6a626a8a6720c47cc12d56bb5210d 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 28de0c794ca1153001a329ffb37e679747a579ca..783b6edd7dca982873913dacea98353655820f9a 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "%s не может быть удалён навсегда"
msgid "Couldn't restore %s"
msgstr "%s не может быть восстановлен"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "выполнить операцию восстановления"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Ошибка"
@@ -39,31 +39,31 @@ msgstr "Ошибка"
msgid "delete file permanently"
msgstr "удалить файл навсегда"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Удалено навсегда"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Имя"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Удалён"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} папок"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} файлов"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 24bebd364f481e49bd2fc5fe991931ea8b1701db..78d3f7898b96c174eacfe2b47376cf7eabc9389b 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 79b382794b12d8140bee3380d087613155af0fc2..83a323ff7a91e855d88c894e8e49d34cd127f245 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помощь"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Личное"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Конфигурация"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Пользователи"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Приложения"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP-скачивание отключено."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Файлы должны быть загружены по одному."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Назад к файлам"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "Невозможно установить"
@@ -113,72 +113,76 @@ msgstr "%s Вы не можете использовать точки в име
msgid "%s set the database host."
msgstr "%s задайте хост базы данных."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Вы должны войти или в существующий аккаунт или под администратором."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Неверное имя пользователя и/или пароль Oracle"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Неверное имя пользователя и/или пароль MySQL"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Ошибка БД: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Вызываемая команда была: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Удалить этого пользователя из MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Пользователь MySQL '%s'@'%%' уже существует"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Удалить этого пользователя из MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Неверное имя пользователя и/или пароль Oracle"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 29b575a0067ea86065a921be524701bffbce8a9c..4e774779e2411c7d86b2ecd16e8301ebb68a247c 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +125,44 @@ msgstr "Обновлено"
msgid "Saving..."
msgstr "Сохранение..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "удален"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "отмена"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Невозможно удалить пользователя"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Группы"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Группа Администраторы"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Удалить"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "добавить группу"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Предоставте подходящее имя пользователя"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Ошибка создания пользователя"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Предоставте подходящий пароль"
@@ -325,11 +325,11 @@ msgstr "Больше"
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Получить приложения для синхронизации
msgid "Show First Run Wizard again"
msgstr "Показать помощник настройки"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Пароль"
@@ -424,39 +424,39 @@ msgstr "Новый пароль"
msgid "Change password"
msgstr "Сменить пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Отображаемое имя"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Ваш адрес электронной почты"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Введите адрес электронной почты чтобы появилась возможность восстановления пароля"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Язык"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Помочь с переводом"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Имя пользователя"
@@ -464,30 +464,34 @@ msgstr "Имя пользователя"
msgid "Create"
msgstr "Создать"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Хранилище по-умолчанию"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Неограниченно"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Другое"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "изменить отображаемое имя"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "установить новый пароль"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "По-умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index cd1cb84f03d09b8a8d3179df8d015d82c7d8b186..597c639b614f072d49ae0433d00bdba0735ea855 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Не удалось удалить конфигурацию сервера"
@@ -53,281 +57,363 @@ msgstr "Сохранить настройки?"
msgid "Cannot add server configuration"
msgstr "Не получилось добавить конфигурацию сервера"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Успешно"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Проверка соединения удалась"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Проверка соединения не удалась"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Вы действительно хотите удалить существующую конфигурацию сервера?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Подтверждение удаления"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. "
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Конфигурация сервера"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Добавить конфигурацию сервера"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Сервер"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Базовый DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "По одному базовому DN в строке."
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN пользователя"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Фильтр входа пользователей"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Фильтр списка пользователей"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Определяет фильтр для применения при получении пользователей."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без заполнителя, например: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Фильтр группы"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Определяет фильтр для применения при получении группы."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без заполнения, например \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Настройки подключения"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Конфигурация активна"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Когда галочка снята, эта конфигурация будет пропущена."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Адрес резервного сервера"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Порт резервного сервера"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Отключение главного сервера"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Когда включено, ownCloud будет соединяться только с резервным сервером."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Использовать TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Отключить проверку сертификата SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Не рекомендуется, используйте только для тестирования."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Кэш времени жизни"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Изменение очистит кэш."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Настройки каталога"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Поле отображаемого имени пользователя"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "База пользовательского дерева"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "По одной базовому DN пользователей в строке."
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Поисковые атрибуты пользователя"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Опционально; один атрибут на линию"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Поле отображаемого имени группы"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP для генерации имени группы ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "База группового дерева"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "По одной базовому DN групп в строке."
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Атрибуты поиска для группы"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Ассоциация Группа-Участник"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Специальные атрибуты"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Поле квота"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Квота по умолчанию"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Поле адресса эллектронной почты"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Правило именования Домашней Папки Пользователя"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Тестовая конфигурация"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index c402a174582882fb20a8610226eb4db333bbcf33..d6d190c1eacb8600b3c61e178a477b622b2e1e0e 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Denis <reg.transifex.net@demitel.ru>, 2013.
-# <sharov3@gmail.com>, 2012.
-# <skoptev@ukr.net>, 2012.
+# Denis <reg.transifex.net@demitel.ru>, 2013
+# adol <sharov3@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index bfbe3274c4516057798452d31f7fee0acb4465a6..4a533168c0007b5932e0d16d2be7a366c2d44b4d 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -243,7 +247,7 @@ msgstr ""
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
@@ -259,7 +263,7 @@ msgstr ""
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "Сделать общим"
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
@@ -470,7 +474,7 @@ msgstr ""
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr ""
+msgstr "Добавить"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr ""
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 32e4d26536d73e213f9437c792bfd3528398568f..097c3e00ba52324a0a277596148db622d922d297 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,17 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
-# skoptev <skoptev@ukr.net>, 2012
-# Langaru <langaru@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 01:55+0200\n"
-"PO-Revision-Date: 2013-04-25 23:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,16 +20,12 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "Неполучается перенести %s - Файл с таким именем уже существует"
+msgstr ""
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr "Неполучается перенести %s "
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Невозможно переименовать файл"
+msgstr ""
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
@@ -41,22 +33,22 @@ msgstr "Файл не был загружен. Неизвестная ошибк
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Ошибка отсутствует, файл загружен успешно."
+msgstr "Ошибки нет, файл успешно загружен"
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:"
+msgstr ""
#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Размер загруженного"
+msgstr "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Загружаемый файл был загружен частично"
+msgstr "Загружаемый файл был загружен лишь частично"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -64,7 +56,7 @@ msgstr "Файл не был загружен"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Отсутствует временная папка"
+msgstr "Отсутствие временной папки"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -76,11 +68,11 @@ msgstr "Недостаточно места в хранилище"
#: ajax/upload.php:83
msgid "Invalid directory."
-msgstr "Неверный каталог."
+msgstr ""
#: appinfo/app.php:12
msgid "Files"
-msgstr "Файлы"
+msgstr ""
#: js/fileactions.js:116
msgid "Share"
@@ -88,172 +80,180 @@ msgstr "Сделать общим"
#: js/fileactions.js:126
msgid "Delete permanently"
-msgstr "Удалить навсегда"
+msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
msgid "Delete"
msgstr "Удалить"
#: js/fileactions.js:194
msgid "Rename"
-msgstr "Переименовать"
+msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
msgid "Pending"
-msgstr "Ожидающий решения"
+msgstr ""
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "{new_name} already exists"
-msgstr "{новое_имя} уже существует"
+msgstr ""
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "replace"
-msgstr "отмена"
+msgstr ""
-#: js/filelist.js:252
+#: js/filelist.js:259
msgid "suggest name"
-msgstr "подобрать название"
+msgstr ""
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "cancel"
-msgstr "отменить"
+msgstr ""
-#: js/filelist.js:299
+#: js/filelist.js:306
msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {новое_имя} с {старое_имя}"
+msgstr ""
-#: js/filelist.js:299
+#: js/filelist.js:306
msgid "undo"
-msgstr "отменить действие"
+msgstr ""
-#: js/filelist.js:324
+#: js/filelist.js:331
msgid "perform delete operation"
-msgstr "выполняется процесс удаления"
+msgstr ""
-#: js/filelist.js:406
+#: js/filelist.js:413
msgid "1 file uploading"
-msgstr "загрузка 1 файла"
+msgstr ""
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
msgid "files uploading"
msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
-msgstr "'.' является неверным именем файла."
+msgstr ""
#: js/files.js:56
msgid "File name cannot be empty."
-msgstr "Имя файла не может быть пустым."
+msgstr ""
#: js/files.js:64
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы."
+msgstr ""
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!"
+msgstr ""
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
+msgstr ""
-#: js/files.js:226
+#: js/files.js:231
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие."
+msgstr ""
-#: js/files.js:259
+#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
+msgstr ""
-#: js/files.js:272
+#: js/files.js:277
msgid "Not enough space available"
-msgstr "Не достаточно свободного места"
+msgstr ""
-#: js/files.js:312
+#: js/files.js:317
msgid "Upload cancelled."
-msgstr "Загрузка отменена"
+msgstr ""
-#: js/files.js:408
+#: js/files.js:413
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
+msgstr ""
-#: js/files.js:481
+#: js/files.js:486
msgid "URL cannot be empty."
-msgstr "URL не должен быть пустым."
+msgstr ""
-#: js/files.js:486
+#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud"
+msgstr ""
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
msgid "Error"
msgstr "Ошибка"
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
msgid "Name"
msgstr "Имя"
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
msgid "Size"
-msgstr "Размер"
+msgstr ""
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
msgid "Modified"
-msgstr "Изменен"
+msgstr ""
-#: js/files.js:893
+#: js/files.js:898
msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
-#: js/files.js:895
+#: js/files.js:900
msgid "{count} folders"
-msgstr "{количество} папок"
+msgstr ""
-#: js/files.js:903
+#: js/files.js:908
msgid "1 file"
-msgstr "1 файл"
+msgstr ""
-#: js/files.js:905
+#: js/files.js:910
msgid "{count} files"
-msgstr "{количество} файлов"
+msgstr ""
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Загрузить "
+msgstr ""
#: templates/admin.php:5
msgid "File handling"
-msgstr "Работа с файлами"
+msgstr ""
#: templates/admin.php:7
msgid "Maximum upload size"
-msgstr "Максимальный размер загружаемого файла"
+msgstr ""
#: templates/admin.php:10
msgid "max. possible: "
-msgstr "Максимально возможный"
+msgstr ""
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Необходимо для множественной загрузки."
+msgstr ""
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Включение ZIP-загрузки"
+msgstr ""
#: templates/admin.php:20
msgid "0 is unlimited"
-msgstr "0 без ограничений"
+msgstr ""
#: templates/admin.php:22
msgid "Maximum input size for ZIP files"
-msgstr "Максимальный размер входящих ZIP-файлов "
+msgstr ""
#: templates/admin.php:26
msgid "Save"
@@ -261,19 +261,19 @@ msgstr "Сохранить"
#: templates/index.php:7
msgid "New"
-msgstr "Новый"
+msgstr ""
#: templates/index.php:10
msgid "Text file"
-msgstr "Текстовый файл"
+msgstr ""
#: templates/index.php:12
msgid "Folder"
-msgstr "Папка"
+msgstr ""
#: templates/index.php:14
msgid "From link"
-msgstr "По ссылке"
+msgstr ""
#: templates/index.php:42
msgid "Deleted files"
@@ -281,42 +281,42 @@ msgstr ""
#: templates/index.php:48
msgid "Cancel upload"
-msgstr "Отмена загрузки"
+msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Nothing in here. Upload something!"
-msgstr "Здесь ничего нет. Загрузите что-нибудь!"
+msgstr ""
-#: templates/index.php:76
+#: templates/index.php:75
msgid "Download"
-msgstr "Загрузить"
+msgstr "Загрузка"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
msgid "Unshare"
-msgstr "Скрыть"
+msgstr ""
-#: templates/index.php:108
+#: templates/index.php:107
msgid "Upload too large"
-msgstr "Загрузка слишком велика"
+msgstr ""
-#: templates/index.php:110
+#: templates/index.php:109
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
+msgstr ""
-#: templates/index.php:115
+#: templates/index.php:114
msgid "Files are being scanned, please wait."
-msgstr "Файлы сканируются, пожалуйста, подождите."
+msgstr ""
-#: templates/index.php:118
+#: templates/index.php:117
msgid "Current scanning"
-msgstr "Текущее сканирование"
+msgstr ""
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "Обновление кэша файловой системы... "
+msgstr ""
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index e9f3e4b2039a80f045316b528b3e147de0ac6036..4690ff89165ba138409b45be7e365d54666c3bad 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -3,14 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2013.
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Сохранение"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
-msgstr "Шифрование"
+msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ни один"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index 1410e66849f978cf2f4d57498335a5d9f000af11..96563330fbce198562678d83e5a05ca6d2636822 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-23 23:58+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,36 +19,36 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
msgid "Access granted"
-msgstr "Доступ разрешен"
+msgstr ""
#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
msgid "Error configuring Dropbox storage"
-msgstr "Ошибка при конфигурировании хранилища Dropbox"
+msgstr ""
#: js/dropbox.js:65 js/google.js:66
msgid "Grant access"
-msgstr "Предоставить доступ"
+msgstr ""
#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
-msgstr "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль."
+msgstr ""
#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
-msgstr "Ошибка настройки хранилища Google Drive"
+msgstr ""
#: lib/config.php:431
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+msgstr ""
#: lib/config.php:434
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее."
+msgstr ""
#: lib/config.php:437
msgid ""
@@ -60,11 +59,11 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr "Внешние системы хранения данных"
+msgstr ""
#: templates/settings.php:9 templates/settings.php:28
msgid "Folder name"
-msgstr "Имя папки"
+msgstr ""
#: templates/settings.php:10
msgid "External storage"
@@ -72,15 +71,15 @@ msgstr ""
#: templates/settings.php:11
msgid "Configuration"
-msgstr "Конфигурация"
+msgstr ""
#: templates/settings.php:12
msgid "Options"
-msgstr "Опции"
+msgstr ""
#: templates/settings.php:13
msgid "Applicable"
-msgstr "Применимый"
+msgstr ""
#: templates/settings.php:33
msgid "Add storage"
@@ -88,11 +87,11 @@ msgstr ""
#: templates/settings.php:90
msgid "None set"
-msgstr "Не задан"
+msgstr ""
#: templates/settings.php:91
msgid "All Users"
-msgstr "Все пользователи"
+msgstr ""
#: templates/settings.php:92
msgid "Groups"
@@ -100,7 +99,7 @@ msgstr "Группы"
#: templates/settings.php:100
msgid "Users"
-msgstr "Пользователи"
+msgstr ""
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
@@ -109,16 +108,16 @@ msgstr "Удалить"
#: templates/settings.php:129
msgid "Enable User External Storage"
-msgstr "Включить пользовательскую внешнюю систему хранения данных"
+msgstr ""
#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
-msgstr "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
+msgstr ""
#: templates/settings.php:141
msgid "SSL root certificates"
-msgstr "Корневые сертификаты SSL"
+msgstr ""
#: templates/settings.php:159
msgid "Import Root Certificate"
-msgstr "Импортировать корневые сертификаты"
+msgstr ""
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index 2f1f872d545eff092fd2a8360f8f3e58070c1e7a..2c8af92a3a6f50867d083821256d7b9beaf68a2a 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_RU/files_sharing.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,21 +19,21 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Пароль"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Передать"
+msgstr ""
#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
-msgstr "%s имеет общий с Вами доступ к папке %s "
+msgstr ""
#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
-msgstr "%s имеет общий с Вами доступ к файлу %s "
+msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
@@ -42,8 +41,8 @@ msgstr "Загрузка"
#: templates/public.php:40
msgid "No preview available for"
-msgstr "Предварительный просмотр недоступен"
+msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "веб-сервисы под Вашим контролем"
+msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index dd27b348b3b423279ccddf6b69a36801e04ea1e5..958cf6f2dd639a28b1bdc6b28cd8bbcbc2871c37 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,60 +20,60 @@ msgstr ""
#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr "%s не может быть удалён навсегда"
+msgstr ""
#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
-msgstr "%s не может быть восстановлен"
+msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
-msgstr "выполнить операцию восстановления"
+msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Ошибка"
#: js/trash.js:34
msgid "delete file permanently"
-msgstr "удалить файл навсегда"
+msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
-msgstr "Удалить навсегда"
+msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Имя"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
-msgstr "Удалён"
+msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
-msgstr "{количество} папок"
+msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
-msgstr "1 файл"
+msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
-msgstr "{количество} файлов"
+msgstr ""
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Здесь ничего нет. Ваша корзина пуста!"
+msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr "Восстановить"
+msgstr ""
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
@@ -82,4 +81,4 @@ msgstr "Удалить"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr "Удаленные файлы"
+msgstr ""
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 8931ebb796c487e3d2511f28d89c97ae9f6f296f..39fe47d2edf66429dbba1d7ccb768e1dc31edd91 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 540aefaac48fc4344f70a6bcd9d26c17cdb25647..1e66c088c085d1b39b4cf5a82af7e6322c6edc5b 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -7,57 +7,57 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Настройки"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
#: search/provider/file.php:26 search/provider/file.php:33
msgid "Text"
-msgstr ""
+msgstr "Текст"
#: search/provider/file.php:29
msgid "Images"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index bea523051683db141277b6b3632ec55a78fe8ef0..34972e5304e5b241f1f8fbc08c282683f3c4108e 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -106,7 +106,7 @@ msgstr ""
#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/apps.js:90
msgid "Updating...."
@@ -122,46 +122,46 @@ msgstr ""
#: js/personal.js:118
msgid "Saving..."
-msgstr ""
+msgstr "Сохранение"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "удалено"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
-msgstr ""
+msgstr "Группы"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,39 +423,39 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
-msgstr ""
+msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
-msgstr ""
+msgstr "Другое"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 3ee3d4714504a8c57098f550377073ce7b572dda..42a5e0fe723d58bafefd42a665e46f4d9400bd60 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,15 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2013.
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +17,10 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -41,7 +43,7 @@ msgstr ""
#: js/settings.js:66
msgid "Deletion failed"
-msgstr "Удаление не удалось"
+msgstr ""
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
@@ -55,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Успех"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них."
+msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> Модуль PHP LDAP не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его."
+msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
-msgstr "Хост"
+msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
+msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
-msgstr "База DN"
+msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
-msgstr "Одно базовое DN на линию"
+msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
+msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
-msgstr "DN пользователя"
+msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
+msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
-msgstr "Пароль"
+msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
+msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
-msgstr "Фильтр имен пользователей"
+msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
+msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
+msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
-msgstr "Фильтр списка пользователей"
+msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
-msgstr "Задает фильтр, применяемый при получении пользователей."
+msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
+msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
-msgstr "Групповой фильтр"
+msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Задает фильтр, применяемый при получении групп."
+msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
+msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
-msgstr "Порт"
+msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
-msgstr "Использовать TLS"
+msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
-msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
+msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
-msgstr "Выключить проверку сертификата SSL."
+msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
+msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
-msgstr "Не рекомендовано, используйте только для тестирования."
+msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
-msgstr "в секундах. Изменение очищает кэш."
+msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
-msgstr "Поле, отображаемое как имя пользователя"
+msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
+msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
-msgstr "Базовое дерево пользователей"
+msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
-msgstr "Одно пользовательское базовое DN на линию"
+msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
-msgstr "Поле, отображаемое как имя группы"
+msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
+msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
-msgstr "Базовое дерево групп"
+msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
-msgstr "Одно групповое базовое DN на линию"
+msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
-msgstr "Связь член-группа"
+msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
-msgstr "в байтах"
+msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
-msgstr "Помощь"
+msgstr ""
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 8223c3dc9ba4af8d253cb4b1176da5ca206b28aa..b2e915245745600192a7e98ad1ce5a91abc8e19d 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2013.
-# <cdewqazxsqwe@gmail.com>, 2012.
-# <skoptev@ukr.net>, 2012.
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "WebDAV аутентификация"
+msgstr ""
#: templates/settings.php:4
msgid "URL: http://"
-msgstr "URL: http://"
+msgstr ""
#: templates/settings.php:7
msgid ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 56ebb8d40520a92b0a04442a70d72facad75d110..ae35207a00ceba4357726f3ee4567784912a47bc 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "පෙර අවුරුද්දේ"
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "හරි"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "තෝරන්න"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "එපා"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "තෝරන්න"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "එපා"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "හරි"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
msgid "web services under your control"
msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "නික්මීම"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 5b8f542999bd7cb46b17d61e55d843684d7c7f97..96681697da4ddf93282a82be035ad81290a88105 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 4f64e1d7f581ac7841a5605e70c8ece321ccd2ef..02b12790e76fd96ce318a04bb0ae6abf8c6388c8 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "සුරැකෙමින් පවතී..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ගුප්ත කේතනය"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "කිසිවක් නැත"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 170cf71d032295091e0d83f8a289d1322e9258ea..73a6fe826e69c57498a05afb2b629cf9a9aeda06 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index e0e7c51d287b62e9d8f7479f5b00c21f48de649a..8f47f1b79b7944dcc07becb00181c755a1593242 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 8ba334fb5afb8543cac17045d04e62e8a1402838..e024e00af13958c6b3cfd82668a69fb6b03ba4d3 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "දෝෂයක්"
@@ -39,31 +39,31 @@ msgstr "දෝෂයක්"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "නම"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 ෆොල්ඩරයක්"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ගොනුවක්"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index e25ea0e116c6a348325c1df0b5a7a2af961b7ca6..5106a985d4fbecb2105824e6822a23cb35bb9caf 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 992b3a584f988b0d3718d47bb8a9270a8f5a2bbe..ad9f12b9f82f77384c0ea16265b00ce936f59c60 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "උදව්"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "පෞද්ගලික"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "සිටුවම්"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "පරිශීලකයන්"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "යෙදුම්"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "පරිපාලක"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP භාගත කිරීම් අක්රියයි"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "ගොනු එකින් එක භාගත යුතුයි"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "ගොනු වෙතට නැවත යන්න"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 4f85fab02b67e2a6a3c0789c7e66a55234944221..64e42fb142b07bbf1346fe664048f218f95d4a66 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "සුරැකෙමින් පවතී..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "නිෂ්ප්රභ කරන්න"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "කණ්ඩායම්"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "කාණ්ඩ පරිපාලක"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "මකා දමන්න"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "වැඩි"
msgid "Less"
msgstr "අඩු"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "මුර පදය"
@@ -423,39 +423,39 @@ msgstr "නව මුරපදය"
msgid "Change password"
msgstr "මුරපදය වෙනස් කිරීම"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "විද්යුත් තැපෑල"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "ඔබගේ විද්යුත් තැපෑල"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "මුරපද ප්රතිස්ථාපනය සඳහා විද්යුත් තැපැල් විස්තර ලබා දෙන්න"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "භාෂාව"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "පරිවර්ථන සහය"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "තනන්න"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "වෙනත්"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index b535f61782cbd616b4e7c0210166e26b94ebdd1d..bf7836dc057fdac6dc42255bb6e7ec27fe71efd5 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "සාර්ථකයි"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "දෝෂයක්"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "සත්කාරකය"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL අවශ්යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "මුර පදය"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "පරිශීලක පිවිසුම් පෙරහන"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "පරිශීලක ලැයිස්තු පෙරහන"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "කණ්ඩායම් පෙරහන"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "තොට"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS භාවිතා කරන්න"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "උදව්"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index cb5a2e879d31b7d6bc8fcdfe96adcd39ed81a1d8..50163948c6c648c760abbc582de5aa7a4db20171 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
+# Anushke Guneratne <anushke@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 267759adeceb26ab009f90c4cc52cdd6db01f93a..fa7bfd1c9efe79167e3de8774df0739ef7fddd04 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 29c0e202761089822737956de93ffce0a3b3aa28..98060efa362ff91eb49974421a21089ecc8c5ea1 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index e1bece6b033097e3cf4413f9c72eff1b723508b4..b91e38b4ebf15d8980ae62451b6e879c2f243314 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 6addb65af317b3e5d018ad5fe9b3fc2dba055554..62d305b600416e89b7b505f8909b5b786c517d64 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 934833781424388897df2be59e3729022a02ee2b..489876c2baa239e0312b17f1a4e55392a18aba53 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index d363a222d42a877b80dd7b6b6a903d6e8cdf8347..101816d2a65655db3cf2cf681413baeea312c405 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
index 1a9009a2aeb2d8f796de2a4c22217b56181e6c61..e61ebf4f94365ff128f53db1ee283eebcb58a1fb 100644
--- a/l10n/sk/files_versions.po
+++ b/l10n/sk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 50d96efd7798169ebf0bf7c791321afdf79329fa..d2b85b1a0fc16e387102dcb0d73aa7e629283a03 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 1c2339b2dc05969f0065116d5bc33e873eadff76..09d08c8666ae8b12d490ac17261f8c2a2c200635 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 289b258772e91fc5ee96075222d89be23b6b68a9..2dd52e55933899c067b573b71c12589eeee30201 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index 4a5a83a1eaba6d652657daf7595895802700ad64..7eac54f7db7adbbda009f2a746536d514912230e 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index ed5350ae61859f7f29612afb563dacaa4ace1114..240ecf0a883f8cd3d006e23685bd1ae1cbfc01a1 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 05:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "pred rokmi"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Výber"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Výber"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nie"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Dokončiť inštaláciu"
msgid "web services under your control"
msgstr "webové služby pod Vašou kontrolou"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Odhlásiť"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 14299ed39141165fd1da96002003ad17594383bb..f3446dad3f47e2b28780548401543dc30207a78f 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -217,7 +218,7 @@ msgstr "{count} súborov"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 3c5194e64cb5874955e1345eaaa2800158f96938..f0b5225a7cb90f01e21ba2bbaff260e89d0064a1 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Heslo úspešne zmenené."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Ukladám..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Šifrovanie"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifrovanie súborov nastavené."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Povolené"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Zakázané"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Zmeniť šifrovacie heslo obnovovacieho kľúča:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Zmeniť heslo"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Uvedené typy súborov nebudú šifrované:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Nešifrovať uvedené typy súborov"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Nastavenie obnovy súborov aktualizované"
-#: templates/settings.php:12
-msgid "None"
-msgstr "Žiadny"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Nemožno aktualizovať obnovenie súborov"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index fdd045ce137d4bb13be40eb36300e0717ee22d5b..637feb1c20cbe72229076266218ef9690297d584 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 19:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 4dbc07b1aca7cbb25bea48952be88edbde60483c..cb69a040d959dda1cb35129e6a16f85604ddb8bd 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e46d3c3aa58db84771299746f7528b6e6b2ae12f..28114d1724b98ab727699798850a5e954164025c 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Nemožno zmazať %s navždy"
msgid "Couldn't restore %s"
msgstr "Nemožno obnoviť %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "vykonať obnovu"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Chyba"
@@ -39,31 +39,31 @@ msgstr "Chyba"
msgid "delete file permanently"
msgstr "trvalo zmazať súbor"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Zmazať trvalo"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Názov"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Zmazané"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 priečinok"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} priečinkov"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 súbor"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} súborov"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index e7044592ad5d67ec33daf6d422111f5ccaf048d1..2e4b2d84383153032a2fe704fdada6c6797683cf 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 2db5eafdca7583e5953b7dfe26935173e23a9599..abc90e244260e803b16d279c764426be36c8d1c2 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -17,47 +18,47 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoc"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobné"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nastavenia"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Používatelia"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikácie"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrátor"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Sťahovanie súborov ZIP je vypnuté."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Súbory musia byť nahrávané jeden za druhým."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Späť na súbory"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nedá sa zistiť"
@@ -113,72 +114,76 @@ msgstr "V názve databázy %s nemôžete používať bodky"
msgid "%s set the database host."
msgstr "Zadajte názov počítača s databázou %s."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Musíte zadať jestvujúci účet alebo administrátora."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Nie je možné pripojiť sa k Oracle"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Chyba DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Podozrivý príkaz bol: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Používateľ '%s'@'localhost' už v MySQL existuje."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Zahodiť používateľa z MySQL."
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Používateľ '%s'@'%%' už v MySQL existuje"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Zahodiť používateľa z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Používateľské meno, alebo heslo MS SQL nie je platné: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index adbef6c0f0cd7a83a3ad40cfabf6e98339961396..85f9ff21ce813647300255c8c79d1993f2ab1708 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 18:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Aktualizované"
msgid "Saving..."
msgstr "Ukladám..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "zmazané"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "vrátiť"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nemožno odobrať používateľa"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Zmazať"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "pridať skupinu"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Musíte zadať platné používateľské meno"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Chyba pri vytváraní používateľa"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Musíte zadať platné heslo"
@@ -325,11 +325,11 @@ msgstr "Viac"
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Získať aplikácie na synchronizáciu Vašich súborov"
msgid "Show First Run Wizard again"
msgstr "Znovu zobraziť sprievodcu prvým spustením"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Heslo"
@@ -424,39 +424,39 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Zobrazované meno"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Vaša emailová adresa"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Prihlasovacie meno"
@@ -464,30 +464,34 @@ msgstr "Prihlasovacie meno"
msgid "Create"
msgstr "Vytvoriť"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Obnovenie hesla administrátora"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Predvolené úložisko"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Nelimitované"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Iné"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Úložisko"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "zmeniť zobrazované meno"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "nastaviť nové heslo"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 5cbcb9424216f7ab6ea7b90fb4ed60883352b2d1..b0224011f40d9ecb25cb0ef2bce2b8107f963638 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -17,6 +18,10 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Nepodarilo sa vymazať mapovania."
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Zlyhalo zmazanie nastavenia servera."
@@ -53,281 +58,363 @@ msgstr "Ponechať nastavenia?"
msgid "Cannot add server configuration"
msgstr "Nemožno pridať nastavenie servera"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "mapovanie vymazané"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Úspešné"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Chyba"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test pripojenia bol úspešný"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Test pripojenia zlyhal"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Naozaj chcete zmazať súčasné nastavenie servera?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potvrdiť vymazanie"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth nie sú kompatibilné. Môže nastávať neočakávané správanie. Požiadajte administrátora systému aby jednu z nich zakázal."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Nastavenia servera"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Pridať nastavenia servera."
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Hostiteľ"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Základné DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Jedno základné DN na riadok"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Používateľské DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filter prihlásenia používateľov"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter zoznamov používateľov"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definuje použitý filter, pre získanie používateľov."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znakov, napr. \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filter skupiny"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definuje použitý filter, pre získanie skupín."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Nastavenie pripojenia"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Nastavenia sú aktívne "
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ak nie je zaškrtnuté, nastavenie bude preskočené."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Záložný server (kópia) hosť"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Záložný server (kópia) port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Zakázať hlavný server"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Pri zapnutí sa ownCloud pripojí len k záložnému serveru."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Použi TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Nepoužívajte pre pripojenie LDAPS, zlyhá."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Vypnúť overovanie SSL certifikátu."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nie je doporučované, len pre testovacie účely."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Životnosť objektov v cache"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Nastavenie priečinka"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Pole pre zobrazenia mena používateľa"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud "
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Základný používateľský strom"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Jedna používateľská základná DN na riadok"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atribúty vyhľadávania používateľov"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Voliteľné, jeden atribút na jeden riadok"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Pole pre zobrazenie mena skupiny"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud "
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Základný skupinový strom"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Jedna skupinová základná DN na riadok"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atribúty vyhľadávania skupín"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Priradenie člena skupiny"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Špeciálne atribúty"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Pole kvóty"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Predvolená kvóta"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "v bajtoch"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pre nastavenie mena používateľského priečinka dát"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interné používateľské meno"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách bude číslo byť pridané / odobrané. Interné používateľské meno sa používa na identifikáciu používateľa interne. Je to tiež predvolený názov používateľského domovského priečinka v ownCloud. To je tiež port vzdialeného URL, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo mapovaných (pridaných) LDAP používateľov."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atribút interného používateľského mena:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Prepísať UUID detekciu"
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID atribút:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Test nastavenia"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index e20d8617a6c167522b14d3df4376a7ec3a9b65a1..b0cb3100e75ec1b3fb97fd269469b2cb9bbd1ae2 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-# <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
+# martin <zatroch.martin@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 47f370c3b5732b3868384f4977752d825da30400..8fbe23e5360f1e1a82e05cce10c211c67ad69ebb 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:58+0200\n"
-"PO-Revision-Date: 2013-05-03 19:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "lansko leto"
msgid "years ago"
msgstr "let nazaj"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "V redu"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Izbor"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Prekliči"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Izbor"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "V redu"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Končaj namestitev"
msgid "web services under your control"
msgstr "spletne storitve pod vašim nadzorom"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index dd91fd8974ef6c4cc7158866f77fa86989d47e4c..aa07ee986036434b0dadb0a3755cdaba7156ed1a 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 716091a2f022b9dbb1f1c5db19820b013b066711..b690829c5b1cc1fc8d1e802ae651353a91cd0687 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Poteka shranjevanje ..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Šifriranje"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifriranje datotek je omogočeno."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Navedene vrste datotek ne bodo šifrirane:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ne šifriraj navedenih vrst datotek:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Brez"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 9b4711622892d0d21b175654b6a25c1b08477207..17bd9c211403aa0138ea0da957019b006469e364 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index e1d7adc7910f275af20a9067ea68dcec436ce118..0a8734395c408b52814b4b68ed8be1ff3595aef3 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 8900ee66e4f52742166f99de0c760962138e829f..5d5ab4fc15d6ce0cfe6b3ee121535f884cf9f545 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Datoteke %s ni mogoče dokončno izbrisati."
msgid "Couldn't restore %s"
msgstr "Ni mogoče obnoviti %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "izvedi opravilo obnavljanja"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Napaka"
@@ -39,31 +39,31 @@ msgstr "Napaka"
msgid "delete file permanently"
msgstr "dokončno izbriši datoteko"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Izbriši dokončno"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Izbrisano"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mapa"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} map"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 datoteka"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} datotek"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 72f744258c63faf148a699d70ef57e70b3599900..3ca64dce8f9317be284834e159483d9ddc1b36f1 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 636c2a101d75bd97d7254579ed37d6493c9ac15b..9c96456cd2babc26c97b245b15668a5f43bd9083 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoč"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osebno"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nastavitve"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Uporabniki"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Programi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Skrbništvo"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Datoteke je mogoče prejeti le posamično."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Nazaj na datoteke"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "ni mogoče določiti"
@@ -113,72 +113,76 @@ msgstr "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik."
msgid "%s set the database host."
msgstr "%s - vnos gostitelja podatkovne zbirke."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Prijaviti se je treba v obstoječi ali pa skrbniški račun."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Napaka podatkovne zbirke: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Napačni ukaz je: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Napačni ukaz je: \"%s\", ime: %s, geslo: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Preverite <a href='%s'>navodila namestitve</a>."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 65640901d208d36a37f89aeab2a2e8bb42829f0d..5fe4dff79e1b283e603e4d37fda0ea92e7a0da94 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +125,44 @@ msgstr "Posodobljeno"
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "izbrisano"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "razveljavi"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoče odstraniti"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Izbriši"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "dodaj skupino"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Navedeno mora biti veljavno uporabniško ime"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Napaka ustvarjanja uporabnika"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
@@ -325,11 +325,11 @@ msgstr "Več"
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Različica"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Pridobi programe za usklajevanje datotek"
msgid "Show First Run Wizard again"
msgstr "Zaženi čarovnika prvega zagona"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Geslo"
@@ -424,39 +424,39 @@ msgstr "Novo geslo"
msgid "Change password"
msgstr "Spremeni geslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Prikazano ime"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Elektronski naslov"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Osebni elektronski naslov"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Sodelujte pri prevajanju"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Prijavno ime"
@@ -464,30 +464,34 @@ msgstr "Prijavno ime"
msgid "Create"
msgstr "Ustvari"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Privzeta shramba"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Neomejeno"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Shramba"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "spremeni prikazano ime"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "nastavi novo geslo"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e5fd3aba3e4b21fd34a2a7d271b87194a5fe73e8..c6b3dec4e80cf12fb9e209f370254414da0aaa3d 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Brisanje nastavitev strežnika je spodletelo."
@@ -53,281 +57,363 @@ msgstr "Ali nas se nastavitve ohranijo?"
msgid "Cannot add server configuration"
msgstr "Ni mogoče dodati nastavitev strežnika"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Uspešno končano."
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Napaka"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Preizkus povezave je uspešno končan."
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Preizkus povezave je spodletel."
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potrdi brisanje"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Opozorilo:</b> možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Nastavitev strežnika"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Dodaj nastavitve strežnika"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Gostitelj"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Osnovni DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "En osnovni DN na vrstico"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti."
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Uporabnik DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Geslo"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Za brezimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filter prijav uporabnikov"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter seznama uporabnikov"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filter skupin"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Določi filter za uporabo med pridobivanjem skupin."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Nastavitve povezave"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Dejavna nastavitev"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Neizbrana možnost preskoči nastavitev."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Vrata"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Varnostna kopija (replika) podatkov gostitelja"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Varnostna kopija (replika) podatka vrat"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Onemogoči glavni strežnik"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Uporabi TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Onemogoči določanje veljavnosti potrdila SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Predpomni podatke TTL"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "v sekundah. Sprememba izprazni predpomnilnik."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Nastavitve mape"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Polje za uporabnikovo prikazano ime"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Osnovno uporabniško drevo"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Eno osnovno uporabniško ime DN na vrstico"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Uporabi atribute iskanja"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Izbirno; en atribut na vrstico"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Polje za prikazano ime skupine"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Osnovno drevo skupine"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Eno osnovno ime skupine DN na vrstico"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributi iskanja skupine"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Povezava član-skupina"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Posebni atributi"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Polje količinske omejitve"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Privzeta količinska omejitev"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "v bajtih"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Polje elektronske pošte"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Pravila poimenovanja uporabniške osebne mape"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Preizkusne nastavitve"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoč"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index dc42b6b156404617e9baf08f5f654e884ab495f0..1d6f802d7e014e1b959809fe333da5674f8ad92a 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 71dbe1382869e7221c37fe30f9a9bdf8e0d0a728..588c201a1dfd2bb1d61be1cba89d64c228635cc2 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "vitin e shkuar"
msgid "years ago"
msgstr "vite më parë"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Në rregull"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Zgjidh"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Anulo"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Zgjidh"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Jo"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Në rregull"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Mbaro setup-in"
msgid "web services under your control"
msgstr "shërbime web nën kontrollin tënd"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Dalje"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index f6b060849e04fd3b226a3f984b404bee3d5bf3f3..724c3d496d263d2b0caf8cb63138c4a0f39e1f38 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index bccdde2ed2ff00031954ee0e17d2a96af678904c..bd48080f91fc44b2f22542a5c58f3563352d7ffe 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 7e3f1dba765ba5056eb5d47b26ea6d1c3f14d8fb..8ce7fabac0f9e9ccfe63f28fac6b1f37ec1897a8 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 2ce9c10dbba27af2abb558d9855ea6fc3baebb68..4615a7ca8bd7b78139fd7ae48b637359f1b043e8 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index afda019715b3495657d5578c07a3acee28c1a0fc..5a1dfc686ec695cb8f75e5c6c7cab87016300a7d 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
msgid "Couldn't restore %s"
msgstr "Nuk munda ta rivendos %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "ekzekuto operacionin e rivendosjes"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Veprim i gabuar"
@@ -39,31 +39,31 @@ msgstr "Veprim i gabuar"
msgid "delete file permanently"
msgstr "eliminoje përfundimisht skedarin"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Elimino përfundimisht"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Emri"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Eliminuar"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 dosje"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} dosje"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 skedar"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} skedarë"
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 4520df0880ff05f779e09f437d1a167b7aca2253..3c148e4911f7392b54ccc3fdd088bd7c354bba6c 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 15687a76d36df670c23f41ce6abc1790d8218253..ac05bfe236c2a9b3778e75fbbb25fa238e6fe354 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ndihmë"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personale"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Parametra"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Përdoruesit"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "App"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Skedarët duhet të shkarkohen një nga një."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Kthehu tek skedarët"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "nuk u vendos dot"
@@ -113,72 +113,76 @@ msgstr "%s nuk mund të përdorni pikat tek emri i database-it"
msgid "%s set the database host."
msgstr "%s caktoni pozicionin (host) e database-it."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Veprim i gabuar i DB-it: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Komanda e gabuar ishte: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Eliminoni këtë përdorues nga MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Eliminoni këtë përdorues nga MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 7ad44cb2f897722d563be4572b2dc5af12cee64b..ca60e24747551caf597b1f5423f674741ddc7c3d 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 22:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "anulo"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Elimino"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Kodi"
@@ -423,39 +423,39 @@ msgstr "Kodi i ri"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email-i"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index d7433610003905b932c9bd0b647eb98e6ac53e1b..0b78efc5c470136224a38d60249bec899627410a 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Veprim i gabuar"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Kodi"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ndihmë"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 9449bd231d54fe5bbcd0b3170def20e838bf0d39..2ffc70b6f16aefb4082758144bd725796c1c41e7 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index c71d78698596707d9a1ed0417a21338113185fc9..3bd4997a95fb40c7a9848ded4c10a7ae129e2db5 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "прошле године"
msgid "years ago"
msgstr "година раније"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "У реду"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Одабери"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Одабери"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Не"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "У реду"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Заврши подешавање"
msgid "web services under your control"
msgstr "веб сервиси под контролом"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Одјава"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 1a261d747e768229bfc0f419c68f24ea9860d4a3..1137159319524ea60a5312235e1b4e5d60db86e9 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 22a63dce3005482ed0ed6dec7ddf4a87d6698e42..1c2c46e27c3f4ab431fc961cb386c26cc82c7f70 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Чување у току..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Шифровање"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ништа"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 83105656cf1ab5a10a016066aef4ca1ebe7fab42..03af7666c7551501b03d91a03258735800743696 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 60f8cfce70e7c8862df025ff833469044de5a7f6..a24d938a0bb9283d8f949b4e7a5d9e03bcecec77 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index a412f3ccd3ff0ec3e17debc4eab74c5bdad5d79b..35c72b956b58f66b7927a772ace3909f15050a05 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "врати у претходно стање"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Грешка"
@@ -39,31 +39,31 @@ msgstr "Грешка"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Обриши за стално"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Обрисано"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 фасцикла"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} фасцикле/и"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 датотека"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} датотеке/а"
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 2c8b97da34dadc67430c0c5754a1c220cf14b7fe..74cb70e53d311356956b56f207470bb4905624f6 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index f2b8abefc58337e5cc54bfa998e1e5831a9782dc..5bcd946dcfc3685a8081253093df67d00b4f0eb2 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помоћ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Лично"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Поставке"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Корисници"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Апликације"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Администратор"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Преузимање ZIP-а је искључено."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Датотеке морате преузимати једну по једну."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Назад на датотеке"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "није одређено"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 405497d2c32412cd38d48ed660e6c3a9ed1256ae..cb20f885bf10bd643670fa7665208c0cb8997737 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Ажурирано"
msgid "Saving..."
msgstr "Чување у току..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "обрисано"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "опозови"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Не могу да уклоним корисника"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групе"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Обриши"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "додај групу"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Морате унети исправно корисничко име"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Грешка при прављењу корисника"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Морате унети исправну лозинку"
@@ -324,11 +324,11 @@ msgstr "Више"
msgid "Less"
msgstr "Мање"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Преузмите апликације ради синхронизов
msgid "Show First Run Wizard again"
msgstr "Поново прикажи чаробњак за прво покретање"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Лозинка"
@@ -423,39 +423,39 @@ msgstr "Нова лозинка"
msgid "Change password"
msgstr "Измени лозинку"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Име за приказ"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Ваша адреса е-поште"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Ун"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Језик"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr " Помозите у превођењу"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Користите ову адресу да се повежете са ownCloud-ом у управљачу датотекама"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Корисничко име"
@@ -463,30 +463,34 @@ msgstr "Корисничко име"
msgid "Create"
msgstr "Направи"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Подразумевано складиште"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Неограничено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Друго"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Складиште"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "промени име за приказ"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "постави нову лозинку"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index a87033c8c506abf841c20e9e9f795432ba15fb90..830588c67a3a24cc61a9cedb0590bfa7d128364d 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Домаћин"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://."
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "База DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Корисник DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Лозинка"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "За анониман приступ, оставите поља DN и лозинка празним."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Филтер за пријаву корисника"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Филтер за списак корисника"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Одређује филтер за примењивање при прибављању корисника."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без икаквог чувара места, нпр. „objectClass=person“."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Филтер групе"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Одређује филтер за примењивање при прибављању група."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Користи TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Искључите потврду SSL сертификата."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Увезите SSL сертификат LDAP сервера у свој ownCloud ако веза ради само са овом опцијом."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Не препоручује се; користите само за тестирање."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "у секундама. Промена испражњава кеш меморију."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Име приказа корисника"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP атрибут за стварање имена ownCloud-а корисника."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Основно стабло корисника"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Име приказа групе"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP атрибут за стварање имена ownCloud-а групе."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Основна стабло група"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Придруживање чланова у групу"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "у бајтовима"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помоћ"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index c72a84c03cb0d4743918d0e5567c498572cb6de3..30b3f69adc1f96ce8b6003cdea9595a0b86b0554 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <theranchcowboy@gmail.com>, 2013.
+# Rancher <theranchcowboy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 555da08b9e8a74546481524df8b6b008998c948a..b9c766b03edc4c22ce28a031bf9b5f6a7d17b77d 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Otkaži"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Završi podešavanje"
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index e7c6cc4f5301cf47a0a2b6c44e6a4e8122edf53f..5e2fce754bd69f461892e151fcf973197ceceaf7 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 457c34823add72b5850803e12b498d7388f064f7..b5ee53a5544eef86b7b5a0c4766b949a43be87ff 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 1c91965f2921582b4f0abc77303ad5b409465175..6a60f8db63d18d668761b37a8439d90b0b2ff532 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index a36fa20faea7aa7d482b01c6c8052d3aea3e0921..5e3e65bfa29f1257b6a4bdf1a254cc3a8338609b 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 717696ba371837d4c0cc72726eae06178034e194..4801956125200a2605172302d47db38de739efa8 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr ""
@@ -39,31 +39,31 @@ msgstr ""
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 2f888ae0aa0c2680cbc3cd5fd170fa3adadf5606..ccd4cfed296b5484159016335baa30c0d5f068e1 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index d2b1782668e23aa775f1fc468d93979d4c06ef15..9171d92be73c6cbdf7bbf81b61da50ff4b613fdd 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoć"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Lično"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Podešavanja"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Korisnici"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Programi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Adninistracija"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index dbfe43bcfc3d7e3f277f5cd312ef4d70062a21ad..c9f8cd90bec616d50b67ed1df60d5edce730e60c 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Obriši"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lozinka"
@@ -423,39 +423,39 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmeni lozinku"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Napravi"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 39eaebf0ac721f3143f641848a1fddf2ece205b4..fa87c1da98e9197cae156f57404edfe20a763157 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lozinka"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoć"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 44c82fe664f3fc14a0c82d46744dd8ce7c85f755..8a2eb941c19457633990317082a2438247fda32f 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 800698a5ad16a8bff875fb9e3700d04496e8c3fe..102f0f4997dae6a51a6201994af03af4a893d351 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "förra året"
msgid "years ago"
msgstr "år sedan"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Välj"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Välj"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nej"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Avsluta installation"
msgid "web services under your control"
msgstr "webbtjänster under din kontroll"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Logga ut"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 0baab452a74211119d1a84d51207221b00fd0a7a..309717a6ab5061895dedbcc216e1f87bc257905a 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 990e7bf1763c8291b0deea16a411875c78f8155d..b6c142e6e098f0b7df64e54203e7365cf32014c7 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Sparar..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Filkryptering är aktiverat."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Följande filtyper kommer inte att krypteras:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Exkludera följande filtyper från kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 9ebda80a2dd67c154ccc1314951e2beb3738fe3b..1a259e127a9dde911fc9f6c394724cfba4551d84 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 2ba2bb298c956434f5df87b0fcbd415312fc2c42..1167bb13e25a90803865d4b21731d04d45f472e0 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 45c3d95fd3a57c00fd7fce2c0475090308c65015..bd5cf20c8bef2a940a50ddda2dff3b56f1584a24 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Kunde inte radera %s permanent"
msgid "Couldn't restore %s"
msgstr "Kunde inte återställa %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "utför återställning"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Fel"
@@ -39,31 +39,31 @@ msgstr "Fel"
msgid "delete file permanently"
msgstr "radera filen permanent"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Radera permanent"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Namn"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Raderad"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 mapp"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} mappar"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 7f6c0a26be09aeca33d2edc635d8d9a8f6212ad3..0448134617cd23efdcf1c2794885def1a20c542d 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index d02feb64ea7df811987f5f862169ad440f3b55bc..0fa69189c89f278a9b4baa5d74f198dfc7b3289e 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjälp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personligt"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Inställningar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Användare"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Program"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Nerladdning av ZIP är avstängd."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Filer laddas ner en åt gången."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Tillbaka till Filer"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Valda filer är för stora för att skapa zip-fil."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "kunde inte bestämmas"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 6d8243e128c0c5e7f101b052e473ae10d16b4590..7df94e6cf6145da515d8981870b7c9b17980ccff 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Uppdaterad"
msgid "Saving..."
msgstr "Sparar..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "raderad"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "ångra"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Radera"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "lägg till grupp"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Ett giltigt användarnamn måste anges"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Fel vid skapande av användare"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
@@ -324,11 +324,11 @@ msgstr "Mer"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Skaffa appar för att synkronisera dina filer"
msgid "Show First Run Wizard again"
msgstr "Visa Första uppstarts-guiden igen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lösenord"
@@ -423,39 +423,39 @@ msgstr "Nytt lösenord"
msgid "Change password"
msgstr "Ändra lösenord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Visat namn"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Din e-postadress"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hjälp att översätta"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Inloggningsnamn"
@@ -463,30 +463,34 @@ msgstr "Inloggningsnamn"
msgid "Create"
msgstr "Skapa"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Förvald lagring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Obegränsad"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Annat"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "ändra visat namn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ange nytt lösenord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 3d51619fa06d78de1961c7f752b759d43a9efed5..801f38e6f451e2a16dc66fccba8f4b6ae1ef27b3 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Misslyckades med att radera serverinställningen"
@@ -53,281 +57,363 @@ msgstr "Behåll inställningarna?"
msgid "Cannot add server configuration"
msgstr "Kunde inte lägga till serverinställning"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Lyckat"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fel"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Anslutningstestet lyckades"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Anslutningstestet misslyckades"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Bekräfta radering"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverinställning"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Lägg till serverinställning"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Server"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Start DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ett Start DN per rad"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Användare DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lösenord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filter logga in användare"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter lista användare"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definierar filter att tillämpa vid listning av användare."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "utan platshållare, t.ex. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppfilter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definierar filter att tillämpa vid listning av grupper."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Uppkopplingsinställningar"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Säkerhetskopierings-värd (Replika)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Säkerhetskopierins-port (Replika)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Inaktivera huvudserver"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Använd TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Använd inte för LDAPS-anslutningar, det kommer inte att fungera."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Stäng av verifiering av SSL-certifikat."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Rekommenderas inte, använd bara för test. "
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En förändring tömmer cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Mappinställningar"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Attribut för användarnamn"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Attribut som används för att generera användarnamn i ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Bas för användare i katalogtjänst"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "En Användare start DN per rad"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Användarsökningsattribut"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Valfritt; ett attribut per rad"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Attribut för gruppnamn"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Attribut som används för att generera gruppnamn i ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Bas för grupper i katalogtjänst"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "En Grupp start DN per rad"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Gruppsökningsattribut"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Attribut för gruppmedlemmar"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Specialattribut"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kvotfält"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Datakvot standard"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-postfält"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Namnregel för hemkatalog"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testa konfigurationen"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjälp"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index 0cb54a97da1e6dc12ac5bc776cbe0ab7e62a6cba..ec341c54811f9aa9daaafe6e76d40421827fbc25 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Magnus Höglund <magnus@linux.com>, 2012-2013.
+# Magnus Höglund <magnus@linux.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 09988ffea27b97ae2b446eeb4b55934befba49c8..ee5e620265e4c695f286e592c152102846096632 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index a8b0ef83d0892b632824018f0fa4db669383fba6..838ddc4ca6120b8af3d3b0b1de067986f88565f2 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 84ed219358a0932144777cf184bff94165f333ea..181a2ef29a7becbe075aefd8f67be2ce1975bb4d 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 9a1b8f84a9c0f65092ac85e14f3e43b56f906b44..7958c592cffe29d5de919f718ed0ab044f064d28 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 327c56dc2f04ae24248745719eff93b8d8d716c2..486d565277c4b30b73f480ce4a037eb8a2e31cd4 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index b865f9f8a675b2251fda23cb1f01b130cb9d25c1..d76092bcb49df3a9993a198df54f041abdca65b9 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index 2a223ee7bba5f7bff314050ab64ee762cea77936..93654e24af738a94d7a9f8121e4250a63f0a3729 100644
--- a/l10n/sw_KE/files_versions.po
+++ b/l10n/sw_KE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 88df9e82be20056d2797086d8272ff8968d00eb0..1b46612b1c1220fa437778f82abebb142724c988 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index e93dc470574e4bb5bf82f64723930362b8ab0c86..a8fd5f1a2c26f0715fd0f162e4bc10ab66420211 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index b16b2afdf5e9c9eb1f32903d2b54fff20d7c79a4..14bfbf0acb2cf8baac6026ca9be43b84233d1581 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/sw_KE/user_webdavauth.po b/l10n/sw_KE/user_webdavauth.po
index 426f5e30721bce1699149d8e299f50ff17be506e..b41a7fe5abf1ffbefb9edfeadcb7aab14c7b2972 100644
--- a/l10n/sw_KE/user_webdavauth.po
+++ b/l10n/sw_KE/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 40d5b280c9b59c8a39b7bd65637590b6edb3d7cd..541f25775e4d9a36752fd458836a732e513c946c 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "கடந்த வருடம்"
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "சரி"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "தெரிவுசெய்க "
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "இரத்து செய்க"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "தெரிவுசெய்க "
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ஆம்"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "இல்லை"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "சரி"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "அமைப்பை முடிக்க"
msgid "web services under your control"
msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "விடுபதிகை செய்க"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index dbcd1813fdd72c091c134f2204a35a37ae035f24..84c0f1c55847e381dacade1a4b3127ed52501032 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index f8019b0d4aefc71984bcc990807586d5f1d5995e..48fb2ff2275a2bac18f4e26b39b37c7bf76cb053 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "சேமிக்கப்படுகிறது..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "மறைக்குறியீடு"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ஒன்றுமில்லை"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 2d1e185537519564e81f59531d73d8e3e128c0bd..ee9a204685d0b829ecaf3c4885eead0a43f4a329 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 2522409a0d4ca5103cd745eb0fe8bd1ceaa0e0a1..68673ba7d68d7c60ec9248fe6984e2ec21676e4a 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index b6113a6d1ddf6e9fb06625b1cec0ae9daaa79a2e..d6637a6e81c5beeffb8d0a703726d57e9ea89e05 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "வழு"
@@ -39,31 +39,31 @@ msgstr "வழு"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "பெயர்"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 கோப்புறை"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{எண்ணிக்கை} கோப்புறைகள்"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 கோப்பு"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{எண்ணிக்கை} கோப்புகள்"
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index 6125b2b2da81ef261a3237275912c81586ed799e..7fbbf568c95b9ce8d5ccaf3ccb938f1c42ff1329 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 5ab85c3d26add3ee8c9de019b6442aadc6471bc1..f655192b5368408ba7da5b80a55d1237ddf3e755 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "உதவி"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "தனிப்பட்ட"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "அமைப்புகள்"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "பயனாளர்"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "செயலிகள்"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "நிர்வாகம்"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "கோப்புகளுக்கு செல்க"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6fff478e034fbceb3503938e5e58b262d68605ff..b10ecfa38b7f838e7773dea75731e963afe2b6cf 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "சேமிக்கப்படுகிறது..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "முன் செயல் நீக்கம் "
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "குழுக்கள்"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "குழு நிர்வாகி"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "நீக்குக"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "மேலதிக"
msgid "Less"
msgstr "குறைவான"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "கடவுச்சொல்"
@@ -423,39 +423,39 @@ msgstr "புதிய கடவுச்சொல்"
msgid "Change password"
msgstr "கடவுச்சொல்லை மாற்றுக"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "மின்னஞ்சல்"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "மொழி"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "மொழிபெயர்க்க உதவி"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "உருவாக்குக"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "மற்றவை"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index a82d11f9a136e26d5e50302bbf3bf980cd133720..c1e4d13f30cf844bb26b2bc013b6e9be612628ad 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "வழு"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ஓம்புனர்"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "தள DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "பயனாளர் DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "கடவுச்சொல்"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "துறை "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS ஐ பயன்படுத்தவும்"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "தள பயனாளர் மரம்"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "குழுவின் காட்சி பெயர் புலம் "
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "தள குழு மரம்"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "குழு உறுப்பினர் சங்கம்"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "bytes களில் "
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "உதவி"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index e75db9cc3f918754065e41886ead8bba674a22a0..fa5d31237c3420d1cd62a0bfb56bd9eb9752ec82 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <suganthi@nic.lk>, 2012.
+# suganthi <suganthi@nic.lk>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 5e3424a27a192193f8644d06d0fd4de4b39971cc..d813185494962bc984a00542f94ef03834cfe0c3 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "పోయిన సంవత్సరం"
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "సరే"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "రద్దుచేయి"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "అవును"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "కాదు"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "సరే"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "నిష్క్రమించు"
diff --git a/l10n/te/files.po b/l10n/te/files.po
index d13a3ed0228f603e5eb5038739acaed16cc4d86b..ed5e2b98335cecfbbaa1e1ffc6e6ccf0878f3dcd 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index d80b40f45259bb129305897a0b3b9a75176e00b0..7ccbc51637f86133be83108c69dad1b676b31002 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 7f8b65ba9857b0cf7cd363bcd1673fc23d1f643e..41448bed38d004b828099bc705d4a464d97961d5 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 84ca97cc6a4908d36001dc0f68c847bdda31cde0..96195fcf7adb60d7a9785ee69b7ea37f93cef09c 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 373705a9ee8de982efe14ea300adea850f51ef92..5511f5b83a7f47b9e674855c12e8df2f029134b2 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "పొరపాటు"
@@ -39,31 +39,31 @@ msgstr "పొరపాటు"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "శాశ్వతంగా తొలగించు"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "పేరు"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/te/files_versions.po b/l10n/te/files_versions.po
index 2a514b335cfd784d61714be156431b6776d54bf8..b745dfb02003ef9f6315c58d0612d52d200b58b1 100644
--- a/l10n/te/files_versions.po
+++ b/l10n/te/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index a51822fe452f8c8be2e62ddee506208ab19b763b..b5399c9037d3a3a45b62923b99120e704eed565b 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "సహాయం"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "అమరికలు"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "వాడుకరులు"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index f270bb90f0d2a34ebf7567d7d5a334780e93af25..59f9d4b82e9b66d40dd24247ac438ad741b9e3d8 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "తొలగించు"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "మరిన్ని"
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "సంకేతపదం"
@@ -423,39 +423,39 @@ msgstr "కొత్త సంకేతపదం"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr ""
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "మీ ఈమెయిలు చిరునామా"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "భాష"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 0166659309bc26f85503a273efb904f186506e85..f21c24d5a54b3bb6651cf0627fad78c4579ddb7a 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "పొరపాటు"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "సంకేతపదం"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "సహాయం"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index bfa7e06be6f86a43deb4a8da80bfc46f236b88fa..dac5225d9649091db96ed6a4a0c0d1da073de536 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 6484f017d5963fae3108a3b75febbf69c32f3ddf..2ca3405b6b9e9b1da02194062001f27206b56cfa 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 3638badffca9517ef28113894fc4eae1d9710004..d73ee78426bedb58606644dd5a1d42a20750a3ac 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 582ea6b8bdd24aafbdd8b5f8751ccd7bd67561b0..57857b20113ba63217a8a4de7ce8d815217a6b00 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,86 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid "Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index cef5406818055b5584034b12ce0673d2838a123c..5ec83aef4a7072face3606b2eddda3c2b33e2440 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 466168d5ec348ca92f5a01dcd351e84b571d2e55..bac3501ca142c925b59d5e1060a281ab80950e4d 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 62e0e019d630909888726afd645f6ce521366068..3f1e20bc01d29f34e39f7894199e6f0c5582d3e9 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr ""
@@ -39,31 +39,31 @@ msgstr ""
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0afc111950cd02472c29ad6f5ba7ec66163a1d13..b1074c24ceae36d1c71520fb759a4a04f5187ad1 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 739486fd3e16f0ab336c381c05be541eda760401..2e31c7de00044200e04da5e778654078d3bd6d17 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,47 +17,47 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:207
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:208
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:239
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:859
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:860
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index babd591ec2e37ebe5d24741233698393717ddeef..ed187b4342407f5807696abac6e51ae86d2f3880 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 02:00+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
@@ -153,15 +153,15 @@ msgstr ""
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,39 +423,39 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr ""
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 519b205bd910dcc5538879c145bc2fa38b45e71b..ee5c2cf2347b0fcc94e7327abfce65fe66d35d86 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,279 +57,361 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
"experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. uid=agent,"
"dc=example,dc=com. For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It "
+"makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name "
+"attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both "
+"users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN "
+"is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 715af4d3568c51554e11564e4a6b200abbed743d..53e61979192e0b8a8ebfd63fa193f6af3faadf1c 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index daec53114a637f2ccd384a83f63e6e7904898528..b88b3cc9248f7b667274da7f877741df6c946863 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "ปีที่แล้ว"
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "ตกลง"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "เลือก"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ยกเลิก"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "เลือก"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ตกลง"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ไม่ตกลง"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "ตกลง"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
msgid "web services under your control"
msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "ออกจากระบบ"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index eda2b6d03df7366c06ce98e50e16cf63ea886464..ccfa0c5ddde6475475d76a4f3c3c172dde462092 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index f6529f0dc5569abecedecda68d7f66422da9c1a3..c52fe69a4c4ce19c16992bba2ff01312768d7509 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "กำลังบันทึกข้อมูล..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "การเข้ารหัส"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ไม่มี"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 4aea7d49168fbc7425498d89545d6f96123a5fa5..b8329a6124b2898d6b284942f7feec8653600343 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index eab4fbbbd7e7230319c86b3eeaeba7c1b33602fd..49c70f024bf7c8d204ecb9eac6dd2c49dbbd0b10 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 59f6d749014def97ff4de7c1a667f4c265bead08..bfcb4d2f46d98a65d7bf5aceac6f74ab584fd05b 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "ดำเนินการคืนค่า"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "ข้อผิดพลาด"
@@ -39,31 +39,31 @@ msgstr "ข้อผิดพลาด"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "ชื่อ"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "ลบแล้ว"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 โฟลเดอร์"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} โฟลเดอร์"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ไฟล์"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ไฟล์"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 2ed8da96a56c760968781e3fb3532b628bc1b752..484c5c2cdad15fbed73559d5792550b3d66372ed 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index cbe237999976dc8e34e0a05e2c0a2c4979dd7ca3..131dfe7946a13974b65974bbb97aed7044632c03 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ช่วยเหลือ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ส่วนตัว"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ตั้งค่า"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ผู้ใช้งาน"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "แอปฯ"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ผู้ดูแล"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "กลับไปที่ไฟล์"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "ไม่สามารถกำหนดได้"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b25982bed32ec603fab309d3dbcaf2baffe2b303..3f942a49f7505a9e35e7f677511d6e5fb8805386 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "อัพเดทแล้ว"
msgid "Saving..."
msgstr "กำลังบันทึกข้อมูล..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "ลบแล้ว"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "เลิกทำ"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "กลุ่ม"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "ผู้ดูแลกลุ่ม"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ลบ"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "มาก"
msgid "Less"
msgstr "น้อย"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "รหัสผ่าน"
@@ -423,39 +423,39 @@ msgstr "รหัสผ่านใหม่"
msgid "Change password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "ชื่อที่ต้องการแสดง"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "อีเมล"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "ที่อยู่อีเมล์ของคุณ"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "ภาษา"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "ช่วยกันแปล"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
@@ -463,30 +463,34 @@ msgstr "ชื่อที่ใช้สำหรับเข้าสู่ร
msgid "Create"
msgstr "สร้าง"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ไม่จำกัดจำนวน"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "อื่นๆ"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "พื้นที่จัดเก็บข้อมูล"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "เปลี่ยนชื่อที่ต้องการให้แสดง"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ตั้งค่ารหัสผ่านใหม่"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index a085e8c732945e7e6b112870ed6620c0d7b90080..53635d7dc984f4d78ab28a8b9bcd484da3fdd48d 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว"
@@ -53,281 +57,363 @@ msgstr "รักษาการตั้งค่าไว้?"
msgid "Cannot add server configuration"
msgstr "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "เสร็จสิ้น"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "ทดสอบการเชื่อมต่อสำเร็จ"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "ทดสอบการเชื่อมต่อล้มเหลว"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "ยืนยันการลบทิ้ง"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>คำเตือน:</b> แอปฯ user_ldap และ user_webdavauth ไม่สามารถใช้งานร่วมกันได้. คุณอาจประสพปัญหาที่ไม่คาดคิดจากเหตุการณ์ดังกล่าว กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อระงับการใช้งานแอปฯ ตัวใดตัวหนึ่งข้างต้น"
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "การกำหนดค่าเซิร์ฟเวอร์"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "เพิ่มการกำหนดค่าเซิร์ฟเวอร์"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "โฮสต์"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN ฐาน"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "หนึ่ง Base DN ต่อบรรทัด"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN ของผู้ใช้งาน"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "รหัสผ่าน"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "ตัวกรองข้อมูลกลุ่ม"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "ตั้งค่าการเชื่อมต่อ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "พอร์ต"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "ปิดใช้งานเซิร์ฟเวอร์หลัก"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "ใช้ TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ตั้งค่าไดเร็กทอรี่"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "รายการผู้ใช้งานหลักแบบ Tree"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "หนึ่ง User Base DN ต่อบรรทัด"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "คุณลักษณะการค้นหาชื่อผู้ใช้"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "รายการกลุ่มหลักแบบ Tree"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "คุณลักษณะการค้นหาแบบกลุ่ม"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "คุณลักษณะพิเศษ"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "ในหน่วยไบต์"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ช่วยเหลือ"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 5c6623a310acf91a0c74962cea1032e16a6ee543..af83ef0d0060b2434360e33667e3cbd4ba5261b1 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 787d2a015e96b06653a57a5952a6786dce918a75..c4abde428187bc22825930cca9679fc984894e71 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "geçen yıl"
msgid "years ago"
msgstr "yıl önce"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Tamam"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "seç"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "İptal"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "seç"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Hayır"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Tamam"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Kurulumu tamamla"
msgid "web services under your control"
msgstr "Bilgileriniz güvenli ve şifreli"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Çıkış yap"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 5c0d5d7ad5d5935642b6e9c922956382e80f1366..0b0da38b58edf1e69ba4f4b739f2ce295bf8cdc1 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} dosya"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index e97475fd9716421a0ffcf4cc63f6ddfa2e0a0d79..82ddb74c5d7030a94513d502522e6486ece32d6f 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Kaydediliyor..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Şifreleme"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Dosya şifreleme aktif."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Belirtilen dosya tipleri şifrelenmeyecek:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Seçilen dosya tiplerini şifreleme:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Hiçbiri"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index b3199728fd94696dc2f11776bf512d32db581a99..4d0e704f51317d65c831fabc0919fafa69dd9c77 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 58a33bd65a14158e9182b4ecfb9e91336af1cd97..8a76095d7ef6c1c15bc33df20e2294e178d846da 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 7727f20a77c071ad33defe35dd62aafb9995b830..254222c64b562096b7f93d7ef60c364f361cab34 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "%s Kalıcı olarak silinemedi"
msgid "Couldn't restore %s"
msgstr "%s Geri yüklenemedi"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "Geri yükleme işlemini gerçekleştir"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Hata"
@@ -39,31 +39,31 @@ msgstr "Hata"
msgid "delete file permanently"
msgstr "Dosyayı kalıcı olarak sil"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Kalıcı olarak sil"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "İsim"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Silindi"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 dizin"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} dizin"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 dosya"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} dosya"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 191e24b1a3a883cee09eb74ebecc53d2f2431e84..9f1d643d13ec99f02e43ea366392a4d64783f067 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 851ae213cc827bb85a524f42deab0d69cd214f2d..14242b6ae81f811f7ec5566c6174271f192380cc 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:59+0200\n"
-"PO-Revision-Date: 2013-05-03 12:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -18,47 +18,47 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Yardım"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Kişisel"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ayarlar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Kullanıcılar"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Uygulamalar"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Yönetici"
-#: files.php:207
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP indirmeleri kapatılmıştır."
-#: files.php:208
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Dosyalara dön"
-#: files.php:239
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "tespit edilemedi"
@@ -114,72 +114,76 @@ msgstr "%s veritabanı adında nokta kullanamayabilirsiniz"
msgid "%s set the database host."
msgstr "%s veritabanı sunucu adını tanımla"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Bir konto veya kullanici birlemek ihtiyacin. "
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Adi klullanici ve/veya parola Oracle mantikli değildir. "
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Hata: ''%s''"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Komut rahasiz ''%s''. "
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL kullanici '%s @local host zatan var. "
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Bu kullanici MySQLden list disari koymak. "
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Bu kulanıcıyı MySQL veritabanından kaldır"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Adi klullanici ve/veya parola Oracle mantikli değildir. "
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index e14def81bc79b3e8d020c1c425e1c7c0cb588d89..7b467a0b707428cc424465165c65e03d6e942a30 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 16:30+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +125,44 @@ msgstr "Güncellendi"
msgid "Saving..."
msgstr "Kaydediliyor..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "silindi"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "geri al"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Sil"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "grup ekle"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Kullanıcı oluşturulurken hata"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
@@ -325,11 +325,11 @@ msgstr "Daha fazla"
msgid "Less"
msgstr "Az"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Sürüm"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
msgid "Show First Run Wizard again"
msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parola"
@@ -424,39 +424,39 @@ msgstr "Yeni parola"
msgid "Change password"
msgstr "Parola değiştir"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Ekran Adı"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Eposta"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Eposta adresiniz"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Dil"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Çevirilere yardım edin"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Giriş Adı"
@@ -464,30 +464,34 @@ msgstr "Giriş Adı"
msgid "Create"
msgstr "Oluştur"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Varsayılan Depolama"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Limitsiz"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Diğer"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Depolama"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "ekran adını değiştir"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "yeni parola belirle"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index d4a0ced72c1b7bafdca35f7ea84e42e777fdb334..dabf4606c8e9dbf1ca38ee92ee860e4eb0399594 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-13 02:04+0200\n"
-"PO-Revision-Date: 2013-05-12 16:20+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,25 +19,29 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr "Sunucu uyunlama basarmadi "
+msgstr "Sunucu yapılandırmasını silme başarısız oldu"
#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
-msgstr "Uyunlama mantikli ve baglama yerlestirmek edebilmi."
+msgstr "Yapılandırma geçerli ve bağlantı kuruldu!"
#: ajax/testConfiguration.php:39
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. "
+msgstr "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz."
#: ajax/testConfiguration.php:43
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
-msgstr "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. "
+msgstr "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız."
#: js/settings.js:66
msgid "Deletion failed"
@@ -44,291 +49,373 @@ msgstr "Silme başarısız oldu"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr "Parametri sonadan uyunlama cikarmak mi?"
+msgstr "Ayarları son sunucu yapılandırmalarından devral?"
#: js/settings.js:83
msgid "Keep settings?"
-msgstr "Ayarları kalsınmı?"
+msgstr "Ayarlar kalsın mı?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr "Sunucu uyunlama birlemek edemen. "
+msgstr "Sunucu yapılandırması eklenemedi"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Hata"
-#: js/settings.js:121
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Bağlantı testi başarılı oldu"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Bağlantı testi başarısız oldu"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Hakikatten, Sonuncu Funksyon durmak istiyor mi?"
+msgstr "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Silmeyi onayla"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. "
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Sunucu uyunlama "
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Sunucu Uyunlama birlemek "
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Sunucu"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. "
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Ana DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Bir Tabani DN herbir dizi. "
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. "
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Kullanıcı DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. "
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parola"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Kullanıcı Oturum Filtresi"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Filter uyunlamak icin tayin ediyor, ne zaman girişmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Kullanıcı Liste Filtresi"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi kullanici geri aliyor. "
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grup Süzgeci"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Bağlantı ayarları"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ne zaman iptal, bu uynnlama isletici "
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Sigorta Kopya Cephe "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Kopya Port "
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Ana sunucuyu devredışı birak"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS kullan"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Bu LDAPS baglama icin kullamaminiz, basamacak. "
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Dusme sunucu LDAP zor degil. (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL sertifika doğrulamasını kapat."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Önerilmez, sadece test için kullanın."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live "
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Parametrar Listesin Adresinin "
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. "
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Temel Kullanıcı Ağacı"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Bir Temel Kullanici DN her dizgi "
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Kategorii Arama Kullanici "
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Grub Ekrane Alani Adi"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP kullamayin grub adi ownCloud uremek icin. "
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Temel Grup Ağacı"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Bir Grubu Tabani DN her dizgi. "
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Kategorii Arama Grubu"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Grup-Üye işbirliği"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "byte cinsinden"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Yardım"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index a5b58c7648ffdb4430fc17e9c4266938c6ee5337..03ee4902c8e8ff8ac92401437edeabd04fedbf84 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-23 01:58+0200\n"
-"PO-Revision-Date: 2013-04-22 20:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index a3627605922a7e9e28e6286e13aca6fdc5aa9f8d..15e214f02f3207c674257dc68b99c4d844425166 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "جەزملە"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ۋاز كەچ"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ياق"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "جەزملە"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "تەڭشەك تامام"
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "تىزىمدىن چىق"
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 10168dedbcf640891439a88578b27cccb2c7f7e6..48bf941b88fcd3d8aed356e366f4878381735857 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index ce1f593333f4b9fc39e65dea1a37b2a9acba24ae..e3519652c883818b8cdb306914ffcbb687c56ec6 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:10+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "ساقلاۋاتىدۇ…"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "شىفىرلاش"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ھۆججەت شىفىرلاش قوزغىتىلدى."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلانمايدۇ:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلاشنىڭ سىرتىدا:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "يوق"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index 1da94038c56cf265b4e163cd8124ea66050cb738..0f35adf4321f29baeb5d277dc55f93d7e6ae2e30 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 85d88c618198534de485d7f25bdbe15ca6bba813..5958fbcb41b184998e1086b5a68f2a61481fbd54 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-08 15:21+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: uqkun <uqkun@outlook.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index af6a62272cd4c4f374ef3fd9b1d53dca5e6feec2..7442a2e88774ce964c7474b9ee67edc97b90c59a 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "خاتالىق"
@@ -39,31 +39,31 @@ msgstr "خاتالىق"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "مەڭگۈلۈك ئۆچۈر"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "ئاتى"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "ئۆچۈرۈلدى"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 قىسقۇچ"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 ھۆججەت"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} ھۆججەت"
diff --git a/l10n/ug/files_versions.po b/l10n/ug/files_versions.po
index bc0751f8d0a6d3b9859f695ad239ee7d4cef1009..65557768200c49138a82cb6389cafb9a266b908a 100644
--- a/l10n/ug/files_versions.po
+++ b/l10n/ug/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:40+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index a14470fe87248743c7c8d8ccbaf258cc933ce42a..eb6d5ef54ba5a969dd537ae2372125673a441902 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 12:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ياردەم"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "شەخسىي"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "تەڭشەكلەر"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ئىشلەتكۈچىلەر"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ئەپلەر"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:207
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:208
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:239
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 056a0697be8fe838e3bca0bae498d9ec6eded68e..2b56b400e9021047e7029f4606dc2ed985a21633 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 12:00+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,16 +136,16 @@ msgstr "يېنىۋال"
msgid "Unable to remove user"
msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "گۇرۇپپا"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "گۇرۇپپا باشقۇرغۇچى"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ئۆچۈر"
@@ -153,15 +153,15 @@ msgstr "ئۆچۈر"
msgid "add group"
msgstr "گۇرۇپپا قوش"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "تېخىمۇ كۆپ"
msgid "Less"
msgstr "ئاز"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "نەشرى"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "ئىم"
@@ -423,39 +423,39 @@ msgstr "يېڭى ئىم"
msgid "Change password"
msgstr "ئىم ئۆزگەرت"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "كۆرسىتىش ئىسمى"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "تورخەت"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "تورخەت ئادرېسىڭىز"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "تىل"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "تەرجىمىگە ياردەم"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "تىزىمغا كىرىش ئاتى"
@@ -463,30 +463,34 @@ msgstr "تىزىمغا كىرىش ئاتى"
msgid "Create"
msgstr "قۇر"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "كۆڭۈلدىكى ساقلىغۇچ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "چەكسىز"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "باشقا"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ساقلىغۇچ"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "يېڭى ئىم تەڭشە"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index f6fcf46d4e23c1d8f160d14ff3365fe72ac9b0ff..a4e5eec6d2beb5a1be26ccf9a1b4bafed663a3e3 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:50+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "خاتالىق"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "باش ئاپپارات"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "ئىم"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ئىشلەتكۈچى تىزىم سۈزگۈچى"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "گۇرۇپپا سۈزگۈچ"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "باغلىنىش تەڭشىكى"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "سەپلىمە ئاكتىپ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "ئېغىز"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS ئىشلەت"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ياردەم"
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index 30ac4d4ad7ece75d83d68b403a986ad8c86f738c..544a8b946eddd0197cb3d989c8cff1d899daf762 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:40+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 8c37c907369f6cfad25a95f069ce20bbac4e18b2..da8ecc080471b7448a9425f3ccf2eae1013d5fd2 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "минулого року"
msgid "years ago"
msgstr "роки тому"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Обрати"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Відмінити"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Обрати"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ні"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "Завершити налаштування"
msgid "web services under your control"
msgstr "підконтрольні Вам веб-сервіси"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Вихід"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index c411fcf37cf137536ecf55e76f094e8ac7da779a..9c95991d399b43c0b3a92eae896d5b95210f749f 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 2d3d805e584299aa12cff7d15229c31b9ddf383f..ea28d0078fa239940b7f0f8e79e542717cc721b8 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Зберігаю..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Шифрування"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Увімкнуто шифрування файлів."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Такі типи файлів шифруватись не будуть:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Виключити наступні типи файлів з шифрування:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Жоден"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index ef3ddfd152d1b1d7bef613282c5ab8e4304881a8..c9962845ce8033e0afa43790e3f06d1bc45de71d 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index a78808b327a4149bb9d6b8eb19aa36a5349206fe..c87feb1467fed032ea950803e5ffe1ae85194029 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 37b8c494805ee33bbae57e14aeff1dbf0eb46c6e..bb0bb28ba04fe5b6c42ac986f5f74bce696bac3a 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Неможливо видалити %s назавжди"
msgid "Couldn't restore %s"
msgstr "Неможливо відновити %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "виконати операцію відновлення"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Помилка"
@@ -39,31 +39,31 @@ msgstr "Помилка"
msgid "delete file permanently"
msgstr "видалити файл назавжди"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Видалити назавжди"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Ім'я"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Видалено"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} папок"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} файлів"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 9cdb2fdef6c6a2434b6163b9793c979a0e70776b..7fb44a00e8b084ee0d5b914e1d5ede9f2891db50 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index af5a7ee2d8945cec5f040f5619ec373b9a3bfdd3..4dc6ec1cd378d5d307cf9274099c78fcbfc0b850 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Допомога"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Особисте"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Налаштування"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Користувачі"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Додатки"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Адмін"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP завантаження вимкнено."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Файли повинні бути завантаженні послідовно."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Повернутися до файлів"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Вибрані фали завеликі для генерування zip файлу."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "не може бути визначено"
@@ -113,72 +113,76 @@ msgstr "%s не можна використовувати крапки в наз
msgid "%s set the database host."
msgstr "%s встановити хост бази даних."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle ім'я користувача та/або пароль не дійсні"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL ім'я користувача та/або пароль не дійсні"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Помилка БД: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Команда, що викликала проблему: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Користувач MySQL '%s'@'localhost' вже існує."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Видалити цього користувача з MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Користувач MySQL '%s'@'%%' вже існує"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Видалити цього користувача з MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle ім'я користувача та/або пароль не дійсні"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 5a52fbc66ede01eddff4d2c4d04adf4659d61a33..8db859cb8388a725441bcdf140e1d866ed0e744b 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Оновлено"
msgid "Saving..."
msgstr "Зберігаю..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "видалені"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "відмінити"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Неможливо видалити користувача"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Адміністратор групи"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Видалити"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "додати групу"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Потрібно задати вірне ім'я користувача"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Помилка при створенні користувача"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
@@ -324,11 +324,11 @@ msgstr "Більше"
msgid "Less"
msgstr "Менше"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Версія"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Отримати додатки для синхронізації ваш
msgid "Show First Run Wizard again"
msgstr "Показувати Майстер Налаштувань знову"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Пароль"
@@ -423,39 +423,39 @@ msgstr "Новий пароль"
msgid "Change password"
msgstr "Змінити пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Показати Ім'я"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Ел.пошта"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Ваша адреса електронної пошти"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Введіть адресу електронної пошти для відновлення паролю"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Мова"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Допомогти з перекладом"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Ім'я Логіну"
@@ -463,30 +463,34 @@ msgstr "Ім'я Логіну"
msgid "Create"
msgstr "Створити"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "сховище за замовчуванням"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Необмежено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Інше"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Сховище"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "змінити зображене ім'я"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "встановити новий пароль"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "За замовчуванням"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 89484b09eeee40af01621d85f779548b3f52a310..3be40699ea190ed18d5a24b97c66ef84f2b082cb 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Не вдалося видалити конфігурацію сервера"
@@ -53,281 +57,363 @@ msgstr "Зберегти налаштування ?"
msgid "Cannot add server configuration"
msgstr "Неможливо додати конфігурацію сервера"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Успіх"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Помилка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Перевірка з'єднання пройшла успішно"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Перевірка з'єднання завершилась неуспішно"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Підтвердіть Видалення"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Налаштування Сервера"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Додати налаштування Сервера"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Хост"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Базовий DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Один Base DN на одній строчці"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Користувача"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Фільтр Користувачів, що під'єднуються"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Фільтр Списку Користувачів"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Фільтр Груп"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Визначає фільтр, який застосовується при отриманні груп."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Налаштування З'єднання"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Налаштування Активне"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Сервер для резервних копій"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Порт сервера для резервних копій"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Вимкнути Головний Сервер"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Коли увімкнуто, ownCloud буде приєднуватись лише до сервера з резервними копіями."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Використовуйте TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечутливий до регістру LDAP сервер (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Вимкнути перевірку SSL сертифіката."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Не рекомендується, використовуйте лише для тестів."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Час актуальності Кеша"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Зміна очищує кеш."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Налаштування Каталога"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Поле, яке відображає Ім'я Користувача"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Основне Дерево Користувачів"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Один Користувач Base DN на одній строчці"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Пошукові Атрибути Користувача"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Додатково; один атрибут на строчку"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Поле, яке відображає Ім'я Групи"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Основне Дерево Груп"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Одна Група Base DN на одній строчці"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Пошукові Атрибути Групи"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Асоціація Група-Член"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Спеціальні Атрибути"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Поле Квоти"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Квота за замовчанням"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Поле Ел. пошти"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Правило іменування домашньої теки користувача"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Тестове налаштування"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Допомога"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index 0b39465a48a85df89836640b40a1186ade0b6ee3..feb00291cb71e04cf311444d840b339e27e1768f 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <skoptev@ukr.net>, 2012.
-# <volodya327@gmail.com>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
+# skoptev <skoptev@ukr.net>, 2012
+# volodya327 <volodya327@gmail.com>, 2012
+# volodya327 <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index dab44591bda6104093bd2f1f0254990675c71c43..c441267db06826ba812fe166bbb089627bb2ac5b 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "اوکے"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "منتخب کریں"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "منسوخ کریں"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "منتخب کریں"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ہاں"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "نہیں"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "اوکے"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "سیٹ اپ ختم کریں"
msgid "web services under your control"
msgstr "آپ کے اختیار میں ویب سروسیز"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "لاگ آؤٹ"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index c9ff60d207536692bad4c0783e7bd8f08b452ac7..9b22814bc59f8f715d6a2e6ee6c9aa1ebb91b641 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 155fc654d03b0bd0be0566cfb6e9ecf8d2abdfe4..7db2a58d18ab47dd95ea4c6606bfaa7e86318e78 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index c1a5f1dda05039bc08b6ca65dfd03a9bd3b087a5..267556951c9491423a202943f97832b2f974dab7 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 3310ed74536c59715ce6a86173b83da0c108581e..a094fe6a21a49c2eb88742b5bf0b865e1125a76b 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 4191c258672ce7805310a5dd7bf495ec5c50ab2d..528141e00bcb37f5f60c1b67701998f12e041984 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "ایرر"
@@ -39,31 +39,31 @@ msgstr "ایرر"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr ""
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index 3cd19f481faeb2c21f7f4fa4511c33265b702277..87f26d3039d1a65d364c2879b0d870f9f9ed8765 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index f12d98a35a0616c4fcecd8771a3e807df9e7aac6..b30e9413266c210b428c2833975a05bf4c8cda14 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-02 02:01+0200\n"
+"PO-Revision-Date: 2013-06-02 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "مدد"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ذاتی"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "سیٹینگز"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "یوزرز"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ایپز"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ایڈمن"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index df2fa2592c01148d016e0a1e5a86116ec75a8f23..cf1c409dc70b830469bb8bf5a769b635e9d4489c 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "پاسورڈ"
@@ -423,39 +423,39 @@ msgstr "نیا پاسورڈ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr ""
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 88926609e226f32f9f0670c1de35a2c4c0a43b98..43aba3ef53903416ae28548df373505c97d392e3 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "ایرر"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "پاسورڈ"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "مدد"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index 874b058a6447778f4ae6d0fd6d9dcdcf79374efa..3082e6561fc97f1b82879dc67ff10b3c55f39f85 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index e6723000ef91e0b02f341bab954b5280ac0702e2..5a04013a53cfabb70820646340282b1b938c156b 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 17:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "năm trước"
msgid "years ago"
msgstr "năm trước"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Đồng ý"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Chọn"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Hủy"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Chọn"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Không"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Đồng ý"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "Cài đặt hoàn tất"
msgid "web services under your control"
msgstr "dịch vụ web dưới sự kiểm soát của bạn"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "Đăng xuất"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index b0d71c5e22f26c2c5f2e2043039dcf817a5bb895..8bdcaa0c0f7f1dd05e3e0e32d9a132e30e8b4831 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 378186a7fc7ee383d7a8430f59a06b0acdecf562..b364dc18140262cb3a3f4ee4c61ab5bd5aa10612 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Đang lưu..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Mã hóa"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Mã hóa file đã mở"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Loại file sau sẽ không được mã hóa"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Việc mã hóa không bao gồm loại file sau"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Không gì cả"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index fd539c747a26b038694dfdb48ca758a3f0ed8174..492533621477eae85e6f9495116218c2d4a86b08 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-05 06:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 97af1379ae094959a477041827d3f6ae99f47dc8..417f805494172d4cf252c2d8ed443781b5490957 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 5131f96d88b3093f31977015c7e2867ebf6abc4b..0a195d4c7eb17f541ff40a7f8c60615d35f1bec9 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "Không thể óa %s vĩnh viễn"
msgid "Couldn't restore %s"
msgstr "Không thể khôi phục %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "thực hiện phục hồi"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "Lỗi"
@@ -39,31 +39,31 @@ msgstr "Lỗi"
msgid "delete file permanently"
msgstr "xóa file vĩnh viễn"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "Xóa vĩnh vễn"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Tên"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "Đã xóa"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 thư mục"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} thư mục"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 tập tin"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} tập tin"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index f65e940269f1321578498eea6c0169d8eb14cee4..ddb86932e17190f540ffd72a503e907f19a1e2e3 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 186aeccd9448a1a53faab1b2e13041a081593ef1..1efe0d773ea6282f3a3e401ebd20d98744bbdfb8 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Giúp đỡ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Cá nhân"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Cài đặt"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Người dùng"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Ứng dụng"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Quản trị"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "Tải về ZIP đã bị tắt."
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "Tập tin cần phải được tải về từng người một."
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "Trở lại tập tin"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "không thể phát hiện được"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index e491b49c01e2a38e2f9bb54bd0ae837a72c7b11b..f966fbdc43459462248529ae4d9b6527ac5995ce 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Đã cập nhật"
msgid "Saving..."
msgstr "Đang lưu..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "đã xóa"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "lùi lại"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Xóa"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr "hơn"
msgid "Less"
msgstr "ít"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Nhận ứng dụng để đồng bộ file của bạn"
msgid "Show First Run Wizard again"
msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Mật khẩu"
@@ -423,39 +423,39 @@ msgstr "Mật khẩu mới"
msgid "Change password"
msgstr "Đổi mật khẩu"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Tên hiển thị"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "Email của bạn"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "Ngôn ngữ"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "Hỗ trợ dịch thuật"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Sử dụng địa chỉ này để kết nối ownCloud của bạn trong trình quản lý file của bạn"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Tên đăng nhập"
@@ -463,30 +463,34 @@ msgstr "Tên đăng nhập"
msgid "Create"
msgstr "Tạo"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Bộ nhớ mặc định"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Không giới hạn"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Khác"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Bộ nhớ"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Thay đổi tên hiển thị"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "đặt mật khẩu mới"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 09d7c04c674e34fcfe3fc00206dd28ecffaf81fa..6bcc06b555706bb050a33e04c42149bfbb957b12 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Thành công"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Lỗi"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Máy chủ"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN cơ bản"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Người dùng DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Mật khẩu"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Lọc người dùng đăng nhập"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lọc danh sách thành viên"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Bộ lọc nhóm"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Connection Settings"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Cổng"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Cổng sao lưu (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Tắt máy chủ chính"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "When switched on, ownCloud will only connect to the replica server."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Sử dụng TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Do not use it additionally for LDAPS connections, it will fail."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Tắt xác thực chứng nhận SSL"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL trong máy chủ ownCloud của bạn."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Directory Settings"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Hiển thị tên người sử dụng"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Cây người dùng cơ bản"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "User Search Attributes"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optional; one attribute per line"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Hiển thị tên nhóm"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Cây nhóm cơ bản"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Group Search Attributes"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Nhóm thành viên Cộng đồng"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Special Attributes"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "Theo Byte"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Giúp đỡ"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 9f0e00a50a2f519fcee2746d56f6a8e4d7c0667b..e3cb6494d123096ff6eca9cc503b2b0f6a9834d2 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sao sang <saosangmo@yahoo.com>, 2013.
-# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+# saosangm <saosangmo@yahoo.com>, 2013
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 3722c01c65838969fc56adc699c8ff1e3b4bd169..b25ca2c7193607a69915870852871d60d67349eb 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "去年"
msgid "years ago"
msgstr "年前"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "好的"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "选择"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "选择"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "否"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "好的"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr "完成安装"
msgid "web services under your control"
msgstr "您控制的网络服务"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "注销"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 1b4d4b16f1ee85cc7fd3ecb1baf5d089b84051f8..993200578185e9c385af2bf51e588ac0f705e3c8 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 172dbb740f3948fc08374bb6ad68ad0828aa1984..d98fa3d78b4c7cf637e04c8b0e403f95f47335d0 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "保存中..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "加密"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "无"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 3ab0f8b0023cec85cb2619a2e4eafaf2baf1807e..ab7f4988e19740ae77a51239973ac032e2a9cf4a 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 61e2a5168a233b70a278e0731b52e6a967d81ad9..a05eaaf358814c7894330cb0648a3171633d6b17 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 487b06cc016ce5d0d15e201411ff51f00fb8afa0..66526ba07455fe76c65cc60934c61257e1c9a1f1 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "出错"
@@ -39,31 +39,31 @@ msgstr "出错"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "名称"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 个文件夹"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 个文件"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} 个文件"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 036989e088e7b1bd2a7fb0be43da0e2e02f38c6a..c1ffcfb75c3dab5151c2d431feb2c4d8a1131d9d 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 526d5f2461349376861e98a6c10638486906e292..b0d6a02aceec7c6bb1fc7a3a71b7843d1780ed53 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "帮助"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "私人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "设置"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "用户"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "程序"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管理员"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP 下载已关闭"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "需要逐个下载文件。"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "返回到文件"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "选择的文件太大而不能生成 zip 文件。"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请双击<a href='%s'>安装向导</a>。"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 06965bd61228ed45a28a34c7e6cce7894727bf8d..dcff59eda7923a1e9337bbbc16acfeab1a40563b 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "已升级"
msgid "Saving..."
msgstr "保存中..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "删除"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "撤销"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "无法移除用户"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "群组"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "群组管理员"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "删除"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "添加群组"
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "请填写有效用户名"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "新增用户时出现错误"
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "请填写有效密码"
@@ -324,11 +324,11 @@ msgstr "更多"
msgid "Less"
msgstr "更少"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "版本"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "获取应用并同步您的文件"
msgid "Show First Run Wizard again"
msgstr "再次显示首次运行向导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密码"
@@ -423,39 +423,39 @@ msgstr "新密码"
msgid "Change password"
msgstr "改变密码"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "显示名称"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "电子邮件"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "你的email地址"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "输入一个邮箱地址以激活密码恢复功能"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "语言"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "使用此地址来在您的文件管理器中连接您的ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登录名"
@@ -463,30 +463,34 @@ msgstr "登录名"
msgid "Create"
msgstr "新建"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "默认容量"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "无限制"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其他"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "容量"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "更改显示名称"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "设置新的密码"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 0836d8955ed6ab0bc60232409f6a9a9f88548668..6b36fb523b1f6d202737bfb1aebbaea78e464ece 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "出错"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "主机"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "基本判别名"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "用户判别名"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密码"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿名访问请留空判别名和密码。"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "用户登录过滤器"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "用户列表过滤器"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义撷取用户时要应用的过滤器。"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "不能使用占位符，例如 \"objectClass=person\"。"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "群组过滤器"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义撷取群组时要应用的过滤器"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。"
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "端口"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "使用 TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "关闭 SSL 证书校验。"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "不推荐，仅供测试"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改会清空缓存。"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "基本用户树"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "群组显示名称字段"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "基本群组树"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "群组-成员组合"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "以字节计"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 672fbad82e5b23ccc17396300209cced93b46172..60e0c7b04498c5a127c865bf555dc601d02b0a04 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index a9e6d7581f5a3a07c025e808c25cc77eca4898fc..5c79d471349182049752ba706b0756d4de5d55e4 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 02:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "去年"
msgid "years ago"
msgstr "年前"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "好"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "选择(&C)..."
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "选择(&C)..."
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "加载文件选择器模板出错"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "否"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "好"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "安装完成"
msgid "web services under your control"
msgstr "您控制的web服务"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s 可用。获取更多关于如何升级的信息。"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "注销"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index a9ab24df245c1b14267794a0330914ad7c4ba19a..a46d71b023ab5f9e8cd41fcd33e1c406b08a3eaa 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: zhangmin <zm1990s@gmail.com>\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"
@@ -217,7 +218,7 @@ msgstr "{count} 个文件"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 9ececa51497f0203b51c176812e5f37b27c0e529..11cd8aa05f3edcf72a17c0bc24791a3298f15bf8 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "保存中"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "加密"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "文件加密已启用."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "如下的文件类型将不会被加密:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "从加密中排除如下的文件类型:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "无"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 4c1d4d64de0d395c65875420da211d4420c312bf..20aae7c898fc73770597928314db9f29792f6a76 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 32f54358999f6697f4f24749af760add9f1a33ec..35fda472ffd0bf1011c695f92be5799ee45a5da7 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 3d23aa4013937b7d3cbc57e7f26b0fa7bc650170..e2735ae9035cc6f986be6d6ee7a38f11cc8bc77e 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "无法彻底删除文件%s"
msgid "Couldn't restore %s"
msgstr "无法恢复%s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "执行恢复操作"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "错误"
@@ -39,31 +39,31 @@ msgstr "错误"
msgid "delete file permanently"
msgstr "彻底删除文件"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "永久删除"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "名称"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "已删除"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1个文件夹"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 个文件"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} 个文件"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index a01c8b41aa6f6596aa8896c95e0b5aa8b14b8e4c..cc566f1c466708570f2e8bf1464ce60bf366a428 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 27fe05a7deeb6427ead216bb9c4d2a8b77dbaacc..e4845047f21b1f52319872df367c2a2416a8fd11 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "帮助"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "个人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "设置"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "用户"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "应用"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管理"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP 下载已经关闭"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "需要逐一下载文件"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "回到文件"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "选择的文件太大，无法生成 zip 文件。"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "无法确定"
@@ -113,72 +113,76 @@ msgstr "%s 您不能在数据库名称中使用英文句号。"
msgid "%s set the database host."
msgstr "%s 设置数据库所在主机。"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL 数据库用户名和/或密码无效"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle 数据库用户名和/或密码无效"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL 数据库用户名和/或密码无效"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "数据库错误：\"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "冲突命令为：\"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL 用户 '%s'@'%%' 已存在"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle 数据库用户名和/或密码无效"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "冲突命令为：\"%s\"，名称：%s，密码：%s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 用户名和/或密码无效：%s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指南</a>."
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9044f64dc2e331114c848af48c13cd385f395f7c..bf5e386cd3b2cc416c8aeb368f8db52b5344738b 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 02:20+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -137,16 +137,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "无法移除用户"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "组"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "组管理员"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "删除"
@@ -154,15 +154,15 @@ msgstr "删除"
msgid "add group"
msgstr "添加组"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "必须提供合法的用户名"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "创建用户出错"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "必须提供合法的密码"
@@ -325,11 +325,11 @@ msgstr "更多"
msgid "Less"
msgstr "更少"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "版本"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "安装应用进行文件同步"
msgid "Show First Run Wizard again"
msgstr "再次显示首次运行向导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密码"
@@ -424,39 +424,39 @@ msgstr "新密码"
msgid "Change password"
msgstr "修改密码"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "显示名称"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "电子邮件"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "您的电子邮件"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "填写电子邮件地址以启用密码恢复功能"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "语言"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "用该地址来连接文件管理器中的 ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登录名称"
@@ -464,30 +464,34 @@ msgstr "登录名称"
msgid "Create"
msgstr "创建"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "默认存储"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "无限"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其它"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "存储"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "修改显示名称"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "设置新密码"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 763966dd291b9011c9d3c60e8250a72428231d74..cad853206bb5d04fa59cc484b072820dfc9118df 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "未能删除服务器配置"
@@ -53,281 +57,363 @@ msgstr "保留设置吗？"
msgid "Cannot add server configuration"
msgstr "无法添加服务器配置"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "错误"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "连接测试成功"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "连接测试失败"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "您真的想要删除当前服务器配置吗？"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "确认删除"
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr "<b>警告：</b>应用 user_ldap 和 user_webdavauth 不兼容。您可能遭遇未预料的行为。请垂询您的系统管理员禁用其中一个。"
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "服务器配置"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "添加服务器配置"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "主机"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "每行一个基本判别名"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡里为用户和组指定Base DN"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密码"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "启用匿名访问，将DN和密码保留为空"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "用户登录过滤"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换"
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid作为占位符，例如“uid=%%uid”"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "用户列表过滤"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义拉取用户时的过滤器"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "没有任何占位符,如 \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "组过滤"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义拉取组信息时的过滤器"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "无需占位符，例如\"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "连接设置"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "现行配置"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "当反选后，此配置将被忽略。"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "端口"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "备份 (镜像) 主机"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "备份 (镜像) 端口"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "禁用主服务器"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "当开启后，ownCloud 将仅连接到镜像服务器。"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "对于 LDAPS 连接不要额外启用它，连接必然失败。"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写敏感LDAP服务器(Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "关闭SSL证书验证"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "暂不推荐，仅供测试"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "缓存存活时间"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改将清空缓存。"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "目录设置"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用来生成用户的ownCloud名称的 LDAP属性"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "基础用户树"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "每行一个用户基准判别名"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "用户搜索属性"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "可选;每行一个属性"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "组显示名称字段"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用来生成组的ownCloud名称的LDAP属性"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "基础组树"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "每行一个群组基准判别名"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "群组搜索属性"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "组成员关联"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "配额字段"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "默认配额"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "字节数"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "电邮字段"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "用户主目录命名规则"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "测试配置"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 7c8b3ea542db15d34f4433bcb1571a5c0a3a7b7a..82c49c2fbc26aad0a61e865da8e4e44e72f9cf2a 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
-# <wengxt@gmail.com>, 2013.
+# hanfeng <appweb.cn@gmail.com>, 2012
+# Dianjin Wang <1132321739qq@gmail.com>, 2012
+# marguerite su <i@marguerite.su>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 524bd63e93256f3c41008eb947aa2a33c577b030..db2899c5acc1f192d360e92840a48db0854eedc9 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -560,12 +564,12 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "登出"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 675fe9c8b4d4bbf90ec2a4e3480c530d3748e63e..b90c1a88c2ce8d2138b379c76bd70f2dd98b2a19 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 2cc250c3866f55a51b9dea5872ec858dcd4ff24e..8956d5a1845185c1d19b6f9f57f675074c699769 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "加密"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "檔案加密已開啟"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "以下文件類別將不會被加密"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "空"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 1b8a3b87058bbebd665112c1dd76108df935b7f5..a492dedfe1ab36986bb35b50162d57f64d75194c 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 3f73a185ada11b0287c92e23cefbfb00a2f3b76b..cc4d9910a5182cfaccb4ba894b1c9e3652b539f0 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 257a2b7d6d2b8a69f87c92b6a73fcac5d7186543..ac820407ffcdd6324f40e0eb18c0cb91d9de8623 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "錯誤"
@@ -39,31 +39,31 @@ msgstr "錯誤"
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "名稱"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr ""
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{}文件夾"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr ""
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr ""
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index a26316004acd9af4c9ba3a2dfadd52a55f372627..dd784928453f287ac939cd41dc7326283228cbeb 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index c47e2fd170704997dfc34c88b41f9c955cee0caa..f093e56bf3565635b7765217ae713375ae947af9 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "幫助"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "個人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "設定"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "用戶"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "軟件"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管理"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr ""
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 8f52891b9d5fb57c691303ee9e4640cdcd2ffde5..852c2569c1b3d3f94dce11cb6a1c93d13726b0ab 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "群組"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "刪除"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密碼"
@@ -423,39 +423,39 @@ msgstr "新密碼"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "電郵"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 1ca728241010d2f779ec77f20763c1e43e2843f0..f2ee3cc4e14592267f0208798e44026a3a96fa85 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "錯誤"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密碼"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "連接埠"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "幫助"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 861fd6ab9874a1bed8e0d019e78b52729ac3ef5e..944ff2142aa58bae225ccdf5d3e2f030c39534d3 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 7d0aefbe77417207917ca6baece6d17588c7da03..46768cd046bc5f3b9511c2b20cbc09b7ae0191be 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 04:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "去年"
msgid "years ago"
msgstr "幾年前"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "好"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "選擇"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "選擇"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "載入檔案選擇器樣板發生錯誤"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "否"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "好"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -561,12 +565,12 @@ msgstr "完成設定"
msgid "web services under your control"
msgstr "由您控制的網路服務"
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
msgid "Log out"
msgstr "登出"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 92e7616365dbbb09587f807404c2e1e188d844c5..7a374f45b2462575fe218559426445035522546e 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pellaeon <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} 個檔案"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index c9a6bba11aa339f455977a57c1ac80a9112b6664..ed4c130a772d395140a1d8e860a69fa558989d20 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pellaeon <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +18,87 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "成功變更密碼。"
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "無法變更密碼，或許是輸入的舊密碼不正確。"
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "儲存中..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "加密"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "檔案加密已被啟用"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "已啓用"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "已停用"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "變更加密密碼還原金鑰："
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "變更密碼"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr "與管理員分享所有檔案以啓用密碼還原功能："
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "以下的文件類型不會被加密："
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案"
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "從加密中排除的檔案類型："
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "檔案還原設定已更新"
-#: templates/settings.php:12
-msgid "None"
-msgstr "無"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "無法更新檔案還原設定"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index e8d127b21bb1c4214e8079b07670fa849f96d3eb..573c495c8bf2fb0bb1f9f67ed795dde5d2be6f0a 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 10:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 848296809134f9ea8ee28232c539ca4a31745d4e..9c7942279e425ab5e8c8598f6be20a438d0205a6 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 02:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index bc188ef03e90d1f750553f8655d459b61b47cb75..32a463d2ebab3d455f6e16e534f7368c4e72eb05 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr "無法永久刪除 %s"
msgid "Couldn't restore %s"
msgstr "無法復原 %s"
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr "進行復原動作"
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr "錯誤"
@@ -39,31 +39,31 @@ msgstr "錯誤"
msgid "delete file permanently"
msgstr "永久刪除檔案"
-#: js/trash.js:121
+#: js/trash.js:123
msgid "Delete permanently"
msgstr "永久刪除"
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "名稱"
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr "已刪除"
-#: js/trash.js:184
+#: js/trash.js:186
msgid "1 folder"
msgstr "1 個資料夾"
-#: js/trash.js:186
+#: js/trash.js:188
msgid "{count} folders"
msgstr "{count} 個資料夾"
-#: js/trash.js:194
+#: js/trash.js:196
msgid "1 file"
msgstr "1 個檔案"
-#: js/trash.js:196
+#: js/trash.js:198
msgid "{count} files"
msgstr "{count} 個檔案"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index ceb0cbe05351883f36729ffaebe978766f214e72..dbe4ec462d0c82a88ccf3cd897b517f37525645a 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 07:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 71930d80bc148ec8fd89df7934a8d51b165dbc55..cc6dc70748eb125dcc918cc21949516611adc0fc 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pellaeon <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "說明"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "個人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "設定"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "使用者"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "應用程式"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管理"
-#: files.php:209
+#: files.php:210
msgid "ZIP download is turned off."
msgstr "ZIP 下載已關閉。"
-#: files.php:210
+#: files.php:211
msgid "Files need to be downloaded one by one."
msgstr "檔案需要逐一下載。"
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
msgid "Back to Files"
msgstr "回到檔案列表"
-#: files.php:241
+#: files.php:242
msgid "Selected files too large to generate zip file."
msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
-#: helper.php:228
+#: helper.php:236
msgid "couldn't be determined"
msgstr "無法判斷"
@@ -113,72 +114,76 @@ msgstr "%s 資料庫名稱不能包含小數點"
msgid "%s set the database host."
msgstr "%s 設定資料庫主機。"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL 用戶名和/或密碼無效"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "您必須輸入一個現有的帳號或管理員帳號。"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle 用戶名和/或密碼無效"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "無法建立 Oracle 資料庫連線"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL 用戶名和/或密碼無效"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "資料庫錯誤：\"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "有問題的指令是：\"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL 使用者 '%s'@'localhost' 已經存在。"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "在 MySQL 移除這個使用者"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL 使用者 '%s'@'%%' 已經存在"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "在 MySQL 移除這個使用者。"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle 用戶名和/或密碼無效"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 使用者和/或密碼無效：%s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "請參考<a href='%s'>安裝指南</a>。"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 7b0dd5b766fdf69476caed823161960bc77c259a..61325b65b5c9c6dd3fd267d7f674cba694acebbd 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 02:00+0200\n"
-"PO-Revision-Date: 2013-05-14 11:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -137,16 +137,16 @@ msgstr "復原"
msgid "Unable to remove user"
msgstr "無法刪除用戶"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "群組"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "群組 管理員"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "刪除"
@@ -154,15 +154,15 @@ msgstr "刪除"
msgid "add group"
msgstr "新增群組"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "一定要提供一個有效的用戶名"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "創建用戶時出現錯誤"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "一定要提供一個有效的密碼"
@@ -325,11 +325,11 @@ msgstr "更多"
msgid "Less"
msgstr "少"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
msgid "Version"
msgstr "版本"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +400,7 @@ msgstr "下載應用程式來同步您的檔案"
msgid "Show First Run Wizard again"
msgstr "再次顯示首次使用精靈"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密碼"
@@ -424,39 +424,39 @@ msgstr "新密碼"
msgid "Change password"
msgstr "變更密碼"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "顯示名稱"
-#: templates/personal.php:68
+#: templates/personal.php:71
msgid "Email"
msgstr "信箱"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Your email address"
msgstr "您的電子郵件信箱"
-#: templates/personal.php:71
+#: templates/personal.php:74
msgid "Fill in an email address to enable password recovery"
msgstr "請填入電子郵件信箱以便回復密碼"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
msgid "Language"
msgstr "語言"
-#: templates/personal.php:89
+#: templates/personal.php:95
msgid "Help translate"
msgstr "幫助翻譯"
-#: templates/personal.php:94
+#: templates/personal.php:100
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:102
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "在您的檔案管理員中使用這個地址來連線到 ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登入名稱"
@@ -464,30 +464,34 @@ msgstr "登入名稱"
msgid "Create"
msgstr "建立"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "管理者復原密碼"
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "預設儲存區"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "無限制"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其他"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "儲存區"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "修改顯示名稱"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "設定新密碼"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "預設"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 29607494a306e007e6ad9799756a54b913116bcd..0a1118b448bfee21c12adb43ad600dc50bc2194e 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 07:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "錯誤"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "主機"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密碼"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "連接阜"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "關閉 SSL 憑證驗證"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "說明"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 4dd48e2ce3d2ab01c7efbef68984aed2ba59fb3b..bfb582efc97056ed32b3a564c128770a7d02211f 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 07:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/app.php b/lib/app.php
index 55b4543ec9f874b0085a9118eb7334748c1f06c0..c6f6e92e60e255d67ece010cf26e432788f70da2 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -172,9 +172,17 @@ class OC_App{
return array();
}
$apps=array('files');
- $query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig`'
- .' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'' );
+ $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
+ .' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
+ if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
+ $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
+ .' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'';
+ }
+ $query = OC_DB::prepare( $sql );
$result=$query->execute();
+ if( \OC_DB::isError($result)) {
+ throw new DatabaseException($result->getMessage(), $query);
+ }
while($row=$result->fetchRow()) {
if(array_search($row['appid'], $apps)===false) {
$apps[]=$row['appid'];
diff --git a/lib/backgroundjob/job.php b/lib/backgroundjob/job.php
new file mode 100644
index 0000000000000000000000000000000000000000..49fbffbd6849039476790058f8e7bd64b2cf3433
--- /dev/null
+++ b/lib/backgroundjob/job.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+abstract class Job {
+ protected $id;
+ protected $lastRun;
+ protected $argument;
+
+ /**
+ * @param JobList $jobList
+ */
+ public function execute($jobList) {
+ $jobList->setLastRun($this);
+ $this->run($this->argument);
+ }
+
+ abstract protected function run($argument);
+
+ public function setId($id) {
+ $this->id = $id;
+ }
+
+ public function setLastRun($lastRun) {
+ $this->lastRun = $lastRun;
+ }
+
+ public function setArgument($argument) {
+ $this->argument = $argument;
+ }
+
+ public function getId() {
+ return $this->id;
+ }
+
+ public function getLastRun() {
+ return $this->lastRun;
+ }
+
+ public function getArgument() {
+ return $this->argument;
+ }
+}
diff --git a/lib/backgroundjob/joblist.php b/lib/backgroundjob/joblist.php
new file mode 100644
index 0000000000000000000000000000000000000000..cc803dd9b5fb73d98e5f67cb8f45f0fe5fe967f1
--- /dev/null
+++ b/lib/backgroundjob/joblist.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+/**
+ * Class QueuedJob
+ *
+ * create a background job that is to be executed once
+ *
+ * @package OC\BackgroundJob
+ */
+class JobList {
+ /**
+ * @param Job|string $job
+ * @param mixed $argument
+ */
+ public function add($job, $argument = null) {
+ if (!$this->has($job, $argument)) {
+ if ($job instanceof Job) {
+ $class = get_class($job);
+ } else {
+ $class = $job;
+ }
+ $argument = json_encode($argument);
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*jobs`(`class`, `argument`, `last_run`) VALUES(?, ?, 0)');
+ $query->execute(array($class, $argument));
+ }
+ }
+
+ /**
+ * @param Job|string $job
+ * @param mixed $argument
+ */
+ public function remove($job, $argument = null) {
+ if ($job instanceof Job) {
+ $class = get_class($job);
+ } else {
+ $class = $job;
+ }
+ if (!is_null($argument)) {
+ $argument = json_encode($argument);
+ $query = \OC_DB::prepare('DELETE FROM `*PREFIX*jobs` WHERE `class` = ? AND `argument` = ?');
+ $query->execute(array($class, $argument));
+ } else {
+ $query = \OC_DB::prepare('DELETE FROM `*PREFIX*jobs` WHERE `class` = ?');
+ $query->execute(array($class));
+ }
+ }
+
+ /**
+ * check if a job is in the list
+ *
+ * @param $job
+ * @param mixed $argument
+ * @return bool
+ */
+ public function has($job, $argument) {
+ if ($job instanceof Job) {
+ $class = get_class($job);
+ } else {
+ $class = $job;
+ }
+ $argument = json_encode($argument);
+ $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*jobs` WHERE `class` = ? AND `argument` = ?');
+ $result = $query->execute(array($class, $argument));
+ return (bool)$result->fetchRow();
+ }
+
+ /**
+ * get all jobs in the list
+ *
+ * @return Job[]
+ */
+ public function getAll() {
+ $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs`');
+ $result = $query->execute();
+ $jobs = array();
+ while ($row = $result->fetchRow()) {
+ $jobs[] = $this->buildJob($row);
+ }
+ return $jobs;
+ }
+
+ /**
+ * get the next job in the list
+ *
+ * @return Job
+ */
+ public function getNext() {
+ $lastId = $this->getLastJob();
+ $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` > ? ORDER BY `id` ASC', 1);
+ $result = $query->execute(array($lastId));
+ if ($row = $result->fetchRow()) {
+ return $this->buildJob($row);
+ } else {
+ //begin at the start of the queue
+ $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` ORDER BY `id` ASC', 1);
+ $result = $query->execute();
+ if ($row = $result->fetchRow()) {
+ return $this->buildJob($row);
+ } else {
+ return null; //empty job list
+ }
+ }
+ }
+
+ /**
+ * @param int $id
+ * @return Job
+ */
+ public function getById($id) {
+ $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?');
+ $result = $query->execute(array($id));
+ if ($row = $result->fetchRow()) {
+ return $this->buildJob($row);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * get the job object from a row in the db
+ *
+ * @param array $row
+ * @return Job
+ */
+ private function buildJob($row) {
+ $class = $row['class'];
+ /**
+ * @var Job $job
+ */
+ $job = new $class();
+ $job->setId($row['id']);
+ $job->setLastRun($row['last_run']);
+ $job->setArgument(json_decode($row['argument']));
+ return $job;
+ }
+
+ /**
+ * set the job that was last ran
+ *
+ * @param Job $job
+ */
+ public function setLastJob($job) {
+ \OC_Appconfig::setValue('backgroundjob', 'lastjob', $job->getId());
+ }
+
+ /**
+ * get the id of the last ran job
+ *
+ * @return int
+ */
+ public function getLastJob() {
+ return \OC_Appconfig::getValue('backgroundjob', 'lastjob', 0);
+ }
+
+ /**
+ * set the lastRun of $job to now
+ *
+ * @param Job $job
+ */
+ public function setLastRun($job) {
+ $query = \OC_DB::prepare('UPDATE `*PREFIX*jobs` SET `last_run` = ? WHERE `id` = ?');
+ $query->execute(array(time(), $job->getId()));
+ }
+}
diff --git a/lib/backgroundjob/legacy/queuedjob.php b/lib/backgroundjob/legacy/queuedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..2bc001103b8607008d1dbb27a6466555a51880cb
--- /dev/null
+++ b/lib/backgroundjob/legacy/queuedjob.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob\Legacy;
+
+class QueuedJob extends \OC\BackgroundJob\QueuedJob {
+ public function run($argument) {
+ $class = $argument['klass'];
+ $method = $argument['method'];
+ $parameters = $argument['parameters'];
+ call_user_func(array($class, $method), $parameters);
+ }
+}
diff --git a/lib/backgroundjob/legacy/regularjob.php b/lib/backgroundjob/legacy/regularjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4cfa348ceace0ecd286df18d6d2a2f51bafa592
--- /dev/null
+++ b/lib/backgroundjob/legacy/regularjob.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob\Legacy;
+
+class RegularJob extends \OC\BackgroundJob\Job {
+ public function run($argument) {
+ call_user_func($argument);
+ }
+}
diff --git a/lib/backgroundjob/queuedjob.php b/lib/backgroundjob/queuedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..1714182820df3d8ba6c8e32cf5b72e4ae90eb4ae
--- /dev/null
+++ b/lib/backgroundjob/queuedjob.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+/**
+ * Class QueuedJob
+ *
+ * create a background job that is to be executed once
+ *
+ * @package OC\BackgroundJob
+ */
+abstract class QueuedJob extends Job {
+ /**
+ * run the job, then remove it from the joblist
+ *
+ * @param JobList $jobList
+ */
+ public function execute($jobList) {
+ $jobList->remove($this);
+ $this->run($this->argument);
+ }
+}
diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
deleted file mode 100644
index b2ce6f39ed8ed365346e0508f400b592baf23837..0000000000000000000000000000000000000000
--- a/lib/backgroundjob/queuedtask.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages our queued tasks.
- */
-class OC_BackgroundJob_QueuedTask{
- /**
- * @brief Gets one queued task
- * @param $id ID of the task
- * @return associative array
- */
- public static function find( $id ) {
- $stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
- $result = $stmt->execute(array($id));
- return $result->fetchRow();
- }
-
- /**
- * @brief Gets all queued tasks
- * @return array with associative arrays
- */
- public static function all() {
- // Array for objects
- $return = array();
-
- // Get Data
- $stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks`' );
- $result = $stmt->execute(array());
- while( $row = $result->fetchRow()) {
- $return[] = $row;
- }
-
- return $return;
- }
-
- /**
- * @brief Gets all queued tasks of a specific app
- * @param $app app name
- * @return array with associative arrays
- */
- public static function whereAppIs( $app ) {
- // Array for objects
- $return = array();
-
- // Get Data
- $stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `app` = ?' );
- $result = $stmt->execute(array($app));
- while( $row = $result->fetchRow()) {
- $return[] = $row;
- }
-
- // Und weg damit
- return $return;
- }
-
- /**
- * @brief queues a task
- * @param $app app name
- * @param $klass class name
- * @param $method method name
- * @param $parameters all useful data as text
- * @return id of task
- */
- public static function add( $app, $klass, $method, $parameters ) {
- $stmt = OC_DB::prepare( 'INSERT INTO `*PREFIX*queuedtasks` (`app`, `klass`, `method`, `parameters`)'
- .' VALUES(?,?,?,?)' );
- $result = $stmt->execute(array($app, $klass, $method, $parameters ));
-
- return OC_DB::insertid();
- }
-
- /**
- * @brief deletes a queued task
- * @param $id id of task
- * @return true/false
- *
- * Deletes a report
- */
- public static function delete( $id ) {
- $stmt = OC_DB::prepare( 'DELETE FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
- $result = $stmt->execute(array($id));
-
- return true;
- }
-}
diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
deleted file mode 100644
index 9976872ee13f75f4005fb7bd8fc5a813c2f4715d..0000000000000000000000000000000000000000
--- a/lib/backgroundjob/regulartask.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages the regular tasks.
- */
-class OC_BackgroundJob_RegularTask{
- static private $registered = array();
-
- /**
- * @brief creates a regular task
- * @param $klass class name
- * @param $method method name
- * @return true
- */
- static public function register( $klass, $method ) {
- // Create the data structure
- self::$registered["$klass-$method"] = array( $klass, $method );
-
- // No chance for failure ;-)
- return true;
- }
-
- /**
- * @brief gets all regular tasks
- * @return associative array
- *
- * key is string "$klass-$method", value is array( $klass, $method )
- */
- static public function all() {
- return self::$registered;
- }
-}
diff --git a/lib/backgroundjob/timedjob.php b/lib/backgroundjob/timedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae9f33505abe169a5d04472e6052476831d11d2b
--- /dev/null
+++ b/lib/backgroundjob/timedjob.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+/**
+ * Class QueuedJob
+ *
+ * create a background job that is to be executed at an interval
+ *
+ * @package OC\BackgroundJob
+ */
+abstract class TimedJob extends Job {
+ protected $interval = 0;
+
+ /**
+ * set the interval for the job
+ *
+ * @param int $interval
+ */
+ public function setInterval($interval) {
+ $this->interval = $interval;
+ }
+
+ /**
+ * run the job if
+ *
+ * @param JobList $jobList
+ */
+ public function execute($jobList) {
+ if ((time() - $this->lastRun) > $this->interval) {
+ $jobList->setLastRun($this);
+ $this->run($this->argument);
+ }
+ }
+}
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
deleted file mode 100644
index e966ac9647c0fc90601bc58915c2e02ce0906d11..0000000000000000000000000000000000000000
--- a/lib/backgroundjob/worker.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class does the dirty work.
- *
- * TODO: locking in doAllSteps
- */
-class OC_BackgroundJob_Worker{
- /**
- * @brief executes all tasks
- * @return boolean
- *
- * This method executes all regular tasks and then all queued tasks.
- * This method should be called by cli scripts that do not let the user
- * wait.
- */
- public static function doAllSteps() {
- // Do our regular work
- $lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
-
- $regular_tasks = OC_BackgroundJob_RegularTask::all();
- ksort( $regular_tasks );
- foreach( $regular_tasks as $key => $value ) {
- if( strcmp( $key, $lasttask ) > 0 ) {
- // Set "restart here" config value
- OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
- call_user_func( $value );
- }
- }
- // Reset "start here" config value
- OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
-
- // Do our queued tasks
- $queued_tasks = OC_BackgroundJob_QueuedTask::all();
- foreach( $queued_tasks as $task ) {
- OC_BackgroundJob_QueuedTask::delete( $task['id'] );
- call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
- }
-
- return true;
- }
-
- /**
- * @brief does a single task
- * @return boolean
- *
- * This method executes one task. It saves the last state and continues
- * with the next step. This method should be used by webcron and ajax
- * services.
- */
- public static function doNextStep() {
- $laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-
- if( $laststep == 'regular_tasks' ) {
- // get last app
- $lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
-
- // What's the next step?
- $regular_tasks = OC_BackgroundJob_RegularTask::all();
- ksort( $regular_tasks );
- $done = false;
-
- // search for next background job
- foreach( $regular_tasks as $key => $value ) {
- if( strcmp( $key, $lasttask ) > 0 ) {
- OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
- $done = true;
- call_user_func( $value );
- break;
- }
- }
-
- if( $done == false ) {
- // Next time load queued tasks
- OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'queued_tasks' );
- }
- }
- else{
- $tasks = OC_BackgroundJob_QueuedTask::all();
- if( count( $tasks )) {
- $task = $tasks[0];
- // delete job before we execute it. This prevents endless loops
- // of failing jobs.
- OC_BackgroundJob_QueuedTask::delete($task['id']);
-
- // execute job
- call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
- }
- else{
- // Next time load queued tasks
- OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
- OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
- }
- }
-
- return true;
- }
-}
diff --git a/lib/base.php b/lib/base.php
index 667202d3aefe0434748a4ff01c2f24ddcf78822a..a6e4a47dbf5381dfeba82fa67932d071724c3960 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -74,6 +74,11 @@ class OC {
*/
protected static $router = null;
+ /**
+ * @var \OC\Session\Session
+ */
+ public static $session = null;
+
/**
* @var \OC\Autoloader $loader
*/
@@ -253,13 +258,16 @@ class OC {
public static function initTemplateEngine() {
// Add the stuff we need always
- OC_Util::addScript("jquery-1.7.2.min");
+ OC_Util::addScript("jquery-1.10.0.min");
+ OC_Util::addScript("jquery-migrate-1.2.1.min");
OC_Util::addScript("jquery-ui-1.10.0.custom");
OC_Util::addScript("jquery-showpassword");
OC_Util::addScript("jquery.infieldlabel");
OC_Util::addScript("jquery-tipsy");
OC_Util::addScript("compatibility");
+ OC_Util::addScript("jquery.ocdialog");
OC_Util::addScript("oc-dialogs");
+ OC_Util::addScript("octemplate");
OC_Util::addScript("js");
OC_Util::addScript("eventsource");
OC_Util::addScript("config");
@@ -271,6 +279,7 @@ class OC {
OC_Util::addStyle("multiselect");
OC_Util::addStyle("jquery-ui-1.10.0.custom");
OC_Util::addStyle("jquery-tipsy");
+ OC_Util::addStyle("jquery.ocdialog");
OC_Util::addScript("oc-requesttoken");
}
@@ -282,14 +291,17 @@ class OC {
$cookie_path = OC::$WEBROOT ?: '/';
ini_set('session.cookie_path', $cookie_path);
- // set the session name to the instance id - which is unique
- session_name(OC_Util::getInstanceId());
+ try{
+ // set the session name to the instance id - which is unique
+ self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
+ // if session cant be started break with http 500 error
+ }catch (Exception $e){
+ //set the session object to a dummy session so code relying on the session existing still works
+ self::$session = new \OC\Session\Memory('');
- // if session cant be started break with http 500 error
- if (session_start() === false){
- OC_Log::write('core', 'Session could not be initialized',
+ OC_Log::write('core', 'Session could not be initialized',
OC_Log::ERROR);
-
+
header('HTTP/1.1 500 Internal Server Error');
OC_Util::addStyle("styles");
$error = 'Session could not be initialized. Please contact your ';
@@ -303,15 +315,15 @@ class OC {
}
// regenerate session id periodically to avoid session fixation
- if (!isset($_SESSION['SID_CREATED'])) {
- $_SESSION['SID_CREATED'] = time();
- } else if (time() - $_SESSION['SID_CREATED'] > 60*60*12) {
+ if (!self::$session->exists('SID_CREATED')) {
+ self::$session->set('SID_CREATED', time());
+ } else if (time() - self::$session->get('SID_CREATED') > 60*60*12) {
session_regenerate_id(true);
- $_SESSION['SID_CREATED'] = time();
+ self::$session->set('SID_CREATED', time());
}
// session timeout
- if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) {
+ if (self::$session->exists('LAST_ACTIVITY') && (time() - self::$session->get('LAST_ACTIVITY') > 60*60*24)) {
if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), '', time() - 42000, $cookie_path);
}
@@ -319,7 +331,8 @@ class OC {
session_destroy();
session_start();
}
- $_SESSION['LAST_ACTIVITY'] = time();
+
+ self::$session->set('LAST_ACTIVITY', time());
}
public static function getRouter() {
@@ -430,12 +443,14 @@ class OC {
stream_wrapper_register('oc', 'OC\Files\Stream\OC');
self::initTemplateEngine();
- self::checkConfig();
- self::checkInstalled();
- self::checkSSL();
if ( !self::$CLI ) {
self::initSession();
+ } else {
+ self::$session = new \OC\Session\Memory('');
}
+ self::checkConfig();
+ self::checkInstalled();
+ self::checkSSL();
$errors = OC_Util::checkServer();
if (count($errors) > 0) {
@@ -445,14 +460,14 @@ class OC {
// User and Groups
if (!OC_Config::getValue("installed", false)) {
- $_SESSION['user_id'] = '';
+ self::$session->set('user_id','');
}
OC_User::useBackend(new OC_User_Database());
OC_Group::useBackend(new OC_Group_Database());
- if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id'])
- && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
+ if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('user_id')
+ && $_SERVER['PHP_AUTH_USER'] != self::$session->get('user_id')) {
OC_User::logout();
}
@@ -524,9 +539,15 @@ class OC {
* register hooks for the cache
*/
public static function registerCacheHooks() {
- // register cache cleanup jobs
- OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
- OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+ if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup
+ // register cache cleanup jobs
+ try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception
+ \OCP\BackgroundJob::registerJob('OC_Cache_FileGlobalGC');
+ } catch (Exception $e) {
+
+ }
+ OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+ }
}
/**
@@ -542,10 +563,12 @@ class OC {
* register hooks for sharing
*/
public static function registerShareHooks() {
- OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
- OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
- OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
- OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+ if(\OC_Config::getValue('installed')) {
+ OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+ OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+ OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+ OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+ }
}
/**
@@ -595,7 +618,7 @@ class OC {
// Handle redirect URL for logged in users
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
-
+
// Deny the redirect if the URL contains a @
// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
if (strpos($location, '@') === false) {
@@ -745,7 +768,7 @@ class OC {
if (OC_User::login($_POST["user"], $_POST["password"])) {
// setting up the time zone
if (isset($_POST['timezone-offset'])) {
- $_SESSION['timezone'] = $_POST['timezone-offset'];
+ self::$session->set('timezone', $_POST['timezone-offset']);
}
self::cleanupLoginTokens($_POST['user']);
diff --git a/lib/cache/file.php b/lib/cache/file.php
index f9ecf41dcacf91f63da8f759434356f086e5574a..531e1d50f40490aa370d14a297cf3bb552cdf450 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -14,6 +14,7 @@ class OC_Cache_File{
return $this->storage;
}
if(OC_User::isLoggedIn()) {
+ \OC\Files\Filesystem::initMountPoints(OC_User::getUser());
$subdir = 'cache';
$view = new \OC\Files\View('/'.OC_User::getUser());
if(!$view->file_exists($subdir)) {
diff --git a/lib/cache/fileglobalgc.php b/lib/cache/fileglobalgc.php
new file mode 100644
index 0000000000000000000000000000000000000000..a29c31f9063087a49dd9d0d3c498d1e1fe23e68d
--- /dev/null
+++ b/lib/cache/fileglobalgc.php
@@ -0,0 +1,8 @@
+<?php
+
+
+class OC_Cache_FileGlobalGC extends \OC\BackgroundJob\Job{
+ public function run($argument){
+ OC_Cache_FileGlobal::gc();
+ }
+}
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 360c3066d05086e2687b139f8a80a705683d1251..1ffa048d6b23b8725538ee5c80673ae18ea6cb93 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -101,7 +101,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
/**
* @brief Ensure that the fileinfo cache is filled
- & @note Uses OC_FileCache or a direct stat
+ * @note Uses OC_FileCache or a direct stat
*/
protected function getFileinfoCache() {
if (!isset($this->fileinfo_cache)) {
diff --git a/lib/db.php b/lib/db.php
index 8f6f50bda6e3c51738586b55e4f6512d48a164c2..618365518331c20798c805352eb92c0e4e1a9801 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -273,18 +273,13 @@ class OC_DB {
break;
case 'oci':
$dsn = array(
- 'phptype' => 'oci8',
- 'username' => $user,
- 'password' => $pass,
- 'charset' => 'AL32UTF8',
+ 'phptype' => 'oci8',
+ 'username' => $user,
+ 'password' => $pass,
+ 'service' => $name,
+ 'hostspec' => $host,
+ 'charset' => 'AL32UTF8',
);
- if ($host != '') {
- $dsn['hostspec'] = $host;
- $dsn['database'] = $name;
- } else { // use dbname for hostspec
- $dsn['hostspec'] = $name;
- $dsn['database'] = $user;
- }
break;
case 'mssql':
$dsn = array(
diff --git a/lib/files.php b/lib/files.php
index ab7fa1ed096ef21ec0d0b8413de8e16cd6920eae..abb1617c25ee85709a618e79fdaab0971da3e411 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -123,8 +123,11 @@ class OC_Files {
header('Content-Length: ' . filesize($filename));
self::addSendfileHeader($filename);
}else{
+ $filesize = \OC\Files\Filesystem::filesize($filename);
header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
- header("Content-Length: ".\OC\Files\Filesystem::filesize($filename));
+ if ($filesize > -1) {
+ header("Content-Length: ".$filesize);
+ }
list($storage) = \OC\Files\Filesystem::resolvePath($filename);
if ($storage instanceof \OC\Files\Storage\Local) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index 7549745e7d757339f0753759832001c106809e0f..8933101577d5cab06c2c59425f5e386b24bffad9 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/files/cache/backgroundwatcher.php
@@ -30,7 +30,7 @@ class BackgroundWatcher {
return;
}
list($storageId, $internalPath) = $cacheItem;
- $mounts = Mount::findByStorageId($storageId);
+ $mounts = Filesystem::getMountByStorageId($storageId);
if (count($mounts) === 0) {
//if the storage we need isn't mounted on default, try to find a user that has access to the storage
@@ -40,7 +40,7 @@ class BackgroundWatcher {
return;
}
Filesystem::initMountPoints($users[0]);
- $mounts = Mount::findByStorageId($storageId);
+ $mounts = Filesystem::getMountByStorageId($storageId);
if (count($mounts) === 0) {
return;
}
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 8f5c9643bef2a006d787792ae0eb1ad3b179d7ea..cae2e63e4dc18746445e582b707bb7b142175560 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -100,6 +100,9 @@ class Cache {
*/
public function get($file) {
if (is_string($file) or $file == '') {
+ // normalize file
+ $file = $this->normalize($file);
+
$where = 'WHERE `storage` = ? AND `path_hash` = ?';
$params = array($this->getNumericStorageId(), md5($file));
} else { //file id
@@ -107,7 +110,7 @@ class Cache {
$params = array($file);
}
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` ' . $where);
$result = $query->execute($params);
$data = $result->fetchRow();
@@ -123,9 +126,13 @@ class Cache {
$data['size'] = (int)$data['size'];
$data['mtime'] = (int)$data['mtime'];
$data['encrypted'] = (bool)$data['encrypted'];
+ $data['unencrypted_size'] = (int)$data['unencrypted_size'];
$data['storage'] = $this->storageId;
$data['mimetype'] = $this->getMimetype($data['mimetype']);
$data['mimepart'] = $this->getMimetype($data['mimepart']);
+ if ($data['storage_mtime'] == 0) {
+ $data['storage_mtime'] = $data['mtime'];
+ }
}
return $data;
@@ -141,13 +148,20 @@ class Cache {
$fileId = $this->getId($folder);
if ($fileId > -1) {
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
- FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
+ FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
+
$result = $query->execute(array($fileId));
+ if (\OC_DB::isError($result)) {
+ \OCP\Util::writeLog('cache', 'getFolderContents failed: ' . $result->getMessage(), \OCP\Util::ERROR);
+ }
$files = $result->fetchAll();
foreach ($files as &$file) {
$file['mimetype'] = $this->getMimetype($file['mimetype']);
$file['mimepart'] = $this->getMimetype($file['mimepart']);
+ if ($file['storage_mtime'] == 0) {
+ $file['storage_mtime'] = $file['mtime'];
+ }
}
return $files;
} else {
@@ -168,6 +182,9 @@ class Cache {
$this->update($id, $data);
return $id;
} else {
+ // normalize file
+ $file = $this->normalize($file);
+
if (isset($this->partial[$file])) { //add any saved partial data
$data = array_merge($this->partial[$file], $data);
unset($this->partial[$file]);
@@ -195,7 +212,7 @@ class Cache {
. ' VALUES(' . implode(', ', $valuesPlaceholder) . ')');
$result = $query->execute($params);
if (\OC_DB::isError($result)) {
- \OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result, \OCP\Util::ERROR);
+ \OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result->getMessage(), \OCP\Util::ERROR);
}
return (int)\OC_DB::insertid('*PREFIX*filecache');
@@ -209,6 +226,17 @@ class Cache {
* @param array $data
*/
public function update($id, array $data) {
+
+ if(isset($data['path'])) {
+ // normalize path
+ $data['path'] = $this->normalize($data['path']);
+ }
+
+ if(isset($data['name'])) {
+ // normalize path
+ $data['name'] = $this->normalize($data['name']);
+ }
+
list($queryParts, $params) = $this->buildParts($data);
$params[] = $id;
@@ -224,7 +252,7 @@ class Cache {
* @return array
*/
function buildParts(array $data) {
- $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'etag');
+ $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'unencrypted_size', 'etag');
$params = array();
$queryParts = array();
foreach ($data as $name => $value) {
@@ -236,6 +264,11 @@ class Cache {
$params[] = $this->getMimetypeId(substr($value, 0, strpos($value, '/')));
$queryParts[] = '`mimepart`';
$value = $this->getMimetypeId($value);
+ } elseif ($name === 'storage_mtime') {
+ if (!isset($data['mtime'])) {
+ $params[] = $value;
+ $queryParts[] = '`mtime`';
+ }
}
$params[] = $value;
$queryParts[] = '`' . $name . '`';
@@ -251,6 +284,9 @@ class Cache {
* @return int
*/
public function getId($file) {
+ // normalize file
+ $file = $this->normalize($file);
+
$pathHash = md5($file);
$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
@@ -318,14 +354,18 @@ class Cache {
* @param string $target
*/
public function move($source, $target) {
+ // normalize source and target
+ $source = $this->normalize($source);
+ $target = $this->normalize($target);
+
$sourceData = $this->get($source);
$sourceId = $sourceData['fileid'];
$newParentId = $this->getParentId($target);
if ($sourceData['mimetype'] === 'httpd/unix-directory') {
//find all child entries
- $query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `path` LIKE ?');
- $result = $query->execute(array($source . '/%'));
+ $query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path` LIKE ?');
+ $result = $query->execute(array($this->getNumericStorageId(), $source . '/%'));
$childEntries = $result->fetchAll();
$sourceLength = strlen($source);
$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
@@ -358,9 +398,15 @@ class Cache {
* @return int, Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
*/
public function getStatus($file) {
+ // normalize file
+ $file = $this->normalize($file);
+
$pathHash = md5($file);
$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
+ if( \OC_DB::isError($result)) {
+ \OCP\Util::writeLog('cache', 'get status failed: ' . $result->getMessage(), \OCP\Util::ERROR);
+ }
if ($row = $result->fetchRow()) {
if ((int)$row['size'] === -1) {
return self::SHALLOW;
@@ -383,8 +429,12 @@ class Cache {
* @return array of file data
*/
public function search($pattern) {
+
+ // normalize pattern
+ $pattern = $this->normalize($pattern);
+
$query = \OC_DB::prepare('
- SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'
);
$result = $query->execute(array($pattern, $this->getNumericStorageId()));
@@ -410,7 +460,7 @@ class Cache {
$where = '`mimepart` = ?';
}
$query = \OC_DB::prepare('
- SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?'
);
$mimetype = $this->getMimetypeId($mimetype);
@@ -498,8 +548,11 @@ class Cache {
*/
public function getIncomplete() {
$query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`'
- . ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
+ . ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC',1);
$result = $query->execute(array($this->getNumericStorageId()));
+ if (\OC_DB::isError($result)) {
+ \OCP\Util::writeLog('cache', 'getIncomplete failed: ' . $result->getMessage(), \OCP\Util::ERROR);
+ }
if ($row = $result->fetchRow()) {
return $row['path'];
} else {
@@ -529,4 +582,14 @@ class Cache {
return null;
}
}
+
+ /**
+ * normalize the given path
+ * @param $path
+ * @return string
+ */
+ public function normalize($path) {
+
+ return \OC_Util::normalizeUnicode($path);
+ }
}
diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index faa5ff5eacc4a5ee938a1d71b12d582c803c2f8a..29c30b0f36c8cb657f4bd28ea8bba4576ec9dcd5 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -85,6 +85,26 @@ class Permissions {
return $filePermissions;
}
+ /**
+ * get the permissions for all files in a folder
+ *
+ * @param int $parentId
+ * @param string $user
+ * @return int[]
+ */
+ public function getDirectoryPermissions($parentId, $user) {
+ $query = \OC_DB::prepare('SELECT `*PREFIX*permissions`.`fileid`, `permissions`
+ FROM `*PREFIX*permissions` INNER JOIN `*PREFIX*filecache` ON `*PREFIX*permissions`.`fileid` = `*PREFIX*filecache`.`fileid`
+ WHERE `*PREFIX*filecache`.`parent` = ? AND `*PREFIX*permissions`.`user` = ?');
+
+ $result = $query->execute(array($parentId, $user));
+ $filePermissions = array();
+ while ($row = $result->fetchRow()) {
+ $filePermissions[$row['fileid']] = $row['permissions'];
+ }
+ return $filePermissions;
+ }
+
/**
* remove the permissions for a file
*
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 661bc4863305e8bc5f197165038038633f9270bf..8f9a7921956f6a4c3fbc9eab9d6ef70b8ee64caf 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -51,6 +51,7 @@ class Scanner {
$data['size'] = $this->storage->filesize($path);
}
$data['etag'] = $this->storage->getETag($path);
+ $data['storage_mtime'] = $data['mtime'];
return $data;
}
@@ -77,18 +78,21 @@ class Scanner {
$this->scanFile($parent);
}
}
- if($cacheData = $this->cache->get($file)) {
+ $newData = $data;
+ if ($cacheData = $this->cache->get($file)) {
+ if ($checkExisting && $data['size'] === -1) {
+ $data['size'] = $cacheData['size'];
+ }
if ($data['mtime'] === $cacheData['mtime'] &&
$data['size'] === $cacheData['size']) {
$data['etag'] = $cacheData['etag'];
}
+ // Only update metadata that has changed
+ $newData = array_diff($data, $cacheData);
}
- if ($checkExisting and $cacheData) {
- if ($data['size'] === -1) {
- $data['size'] = $cacheData['size'];
- }
+ if (!empty($newData)) {
+ $this->cache->put($file, $newData);
}
- $this->cache->put($file, $data);
}
return $data;
}
@@ -115,7 +119,7 @@ class Scanner {
\OC_DB::beginTransaction();
while ($file = readdir($dh)) {
$child = ($path) ? $path . '/' . $file : $file;
- if (!$this->isIgnoredDir($file)) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
if ($data) {
if ($data['size'] === -1) {
@@ -149,18 +153,6 @@ class Scanner {
return $size;
}
- /**
- * @brief check if the directory should be ignored when scanning
- * NOTE: the special directories . and .. would cause never ending recursion
- * @param String $dir
- * @return boolean
- */
- private function isIgnoredDir($dir) {
- if ($dir === '.' || $dir === '..') {
- return true;
- }
- return false;
- }
/**
* @brief check if the file should be ignored when scanning
* NOTE: files with a '.part' extension are ignored as well!
@@ -179,9 +171,11 @@ class Scanner {
* walk over any folders that are not fully scanned yet and scan them
*/
public function backgroundScan() {
- while (($path = $this->cache->getIncomplete()) !== false) {
+ $lastPath = null;
+ while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
$this->scan($path);
$this->cache->correctFolderSize($path);
+ $lastPath = $path;
}
}
}
diff --git a/lib/files/cache/watcher.php b/lib/files/cache/watcher.php
index 31059ec7f56883cd9105291c775d4f1f1d77ff13..8bfd4602f3aae9f0ee8ca0233b09be0c5faf8464 100644
--- a/lib/files/cache/watcher.php
+++ b/lib/files/cache/watcher.php
@@ -43,7 +43,7 @@ class Watcher {
*/
public function checkUpdate($path) {
$cachedEntry = $this->cache->get($path);
- if ($this->storage->hasUpdated($path, $cachedEntry['mtime'])) {
+ if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) {
if ($this->storage->is_dir($path)) {
$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
} else {
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d60d430d77cb76da949ad7d8e712170d93d453f0..d3fddf8c421ba73f19e0d172acef4e6cf15ff669 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -152,6 +152,9 @@ class Filesystem {
* @return string
*/
static public function getMountPoint($path) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
$mount = self::$mounts->find($path);
if ($mount) {
return $mount->getMountPoint();
@@ -167,6 +170,9 @@ class Filesystem {
* @return string[]
*/
static public function getMountPoints($path) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
$result = array();
$mounts = self::$mounts->findIn($path);
foreach ($mounts as $mount) {
@@ -182,6 +188,9 @@ class Filesystem {
* @return \OC\Files\Storage\Storage
*/
public static function getStorage($mountPoint) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
$mount = self::$mounts->find($mountPoint);
return $mount->getStorage();
}
@@ -191,6 +200,9 @@ class Filesystem {
* @return Mount\Mount[]
*/
public static function getMountByStorageId($id) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
return self::$mounts->findByStorageId($id);
}
@@ -199,6 +211,9 @@ class Filesystem {
* @return Mount\Mount[]
*/
public static function getMountByNumericId($id) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
return self::$mounts->findByNumericId($id);
}
@@ -209,6 +224,9 @@ class Filesystem {
* @return array consisting of the storage and the internal path
*/
static public function resolvePath($path) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
$mount = self::$mounts->find($path);
if ($mount) {
return array($mount->getStorage(), $mount->getInternalPath($path));
@@ -223,7 +241,7 @@ class Filesystem {
}
self::$defaultInstance = new View($root);
- if(!self::$mounts) {
+ if (!self::$mounts) {
self::$mounts = new Mount\Manager();
}
@@ -235,8 +253,10 @@ class Filesystem {
return true;
}
- static public function initMounts(){
- self::$mounts = new Mount\Manager();
+ static public function initMounts() {
+ if (!self::$mounts) {
+ self::$mounts = new Mount\Manager();
+ }
}
/**
@@ -357,7 +377,9 @@ class Filesystem {
* clear all mounts and storage backends
*/
public static function clearMounts() {
- self::$mounts->clear();
+ if (self::$mounts) {
+ self::$mounts->clear();
+ }
}
/**
@@ -368,6 +390,9 @@ class Filesystem {
* @param string $mountpoint
*/
static public function mount($class, $arguments, $mountpoint) {
+ if (!self::$mounts) {
+ \OC_Util::setupFS();
+ }
$mount = new Mount\Mount($class, $mountpoint, $arguments);
self::$mounts->addMount($mount);
}
@@ -453,6 +478,19 @@ class Filesystem {
return (in_array($filename, $blacklist));
}
+ /**
+ * @brief check if the directory should be ignored when scanning
+ * NOTE: the special directories . and .. would cause never ending recursion
+ * @param String $dir
+ * @return boolean
+ */
+ static public function isIgnoredDir($dir) {
+ if ($dir === '.' || $dir === '..') {
+ return true;
+ }
+ return false;
+ }
+
/**
* following functions are equivalent to their php builtin equivalents for arguments/return values.
*/
@@ -616,9 +654,8 @@ class Filesystem {
$path = substr($path, 0, -1);
}
//normalize unicode if possible
- if (class_exists('Normalizer')) {
- $path = \Normalizer::normalize($path);
- }
+ $path = \OC_Util::normalizeUnicode($path);
+
return $path;
}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index e87fe3b5239bde3c75e3e9b5c79fe1ac3c67e2d4..3da13ac4df05306165b9f4a1e74908f468fcf7eb 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -138,27 +138,21 @@ abstract class Common implements \OC\Files\Storage\Storage {
*/
public function deleteAll($directory, $empty = false) {
$directory = trim($directory, '/');
-
- if (!$this->file_exists(\OCP\USER::getUser() . '/' . $directory)
- || !$this->is_dir(\OCP\USER::getUser() . '/' . $directory)
- ) {
- return false;
- } elseif (!$this->isReadable(\OCP\USER::getUser() . '/' . $directory)) {
+ if (!$this->is_dir($directory) || !$this->isReadable($directory)) {
return false;
} else {
- $directoryHandle = $this->opendir(\OCP\USER::getUser() . '/' . $directory);
+ $directoryHandle = $this->opendir($directory);
while ($contents = readdir($directoryHandle)) {
- if ($contents != '.' && $contents != '..') {
- $path = $directory . "/" . $contents;
+ if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
+ $path = $directory . '/' . $contents;
if ($this->is_dir($path)) {
$this->deleteAll($path);
} else {
- $this->unlink(\OCP\USER::getUser() . '/' . $path); // TODO: make unlink use same system path as is_dir
+ $this->unlink($path);
}
}
}
- //$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
- if ($empty == false) {
+ if ($empty === false) {
if (!$this->rmdir($directory)) {
return false;
}
diff --git a/lib/files/view.php b/lib/files/view.php
index f35e1e3dc161727ed034b86262b93d3fb7b5d6de..ecb0f30400a43545a444cc86a402421bb6f619f8 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -251,8 +251,11 @@ class View {
if (!$this->file_exists($path)) {
$hooks[] = 'write';
}
-
- return $this->basicOperation('touch', $path, $hooks, $mtime);
+ $result = $this->basicOperation('touch', $path, $hooks, $mtime);
+ if (!$result) { //if native touch fails, we emulate it by changing the mtime in the cache
+ $this->putFileInfo($path, array('mtime' => $mtime));
+ }
+ return true;
}
public function file_get_contents($path) {
@@ -264,7 +267,7 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data)
and Filesystem::isValidPath($path)
- and ! Filesystem::isFileBlacklisted($path)
+ and !Filesystem::isFileBlacklisted($path)
) {
$path = $this->getRelativePath($absolutePath);
$exists = $this->file_exists($path);
@@ -341,7 +344,7 @@ class View {
\OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2)
and Filesystem::isValidPath($path2)
and Filesystem::isValidPath($path1)
- and ! Filesystem::isFileBlacklisted($path2)
+ and !Filesystem::isFileBlacklisted($path2)
) {
$path1 = $this->getRelativePath($absolutePath1);
$path2 = $this->getRelativePath($absolutePath2);
@@ -368,15 +371,24 @@ class View {
list(, $internalPath2) = Filesystem::resolvePath($absolutePath2 . $postFix2);
if ($storage) {
$result = $storage->rename($internalPath1, $internalPath2);
+ \OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
} else {
$result = false;
}
} else {
- $source = $this->fopen($path1 . $postFix1, 'r');
- $target = $this->fopen($path2 . $postFix2, 'w');
- list($count, $result) = \OC_Helper::streamCopy($source, $target);
- list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
- $storage1->unlink($internalPath1);
+ if ($this->is_dir($path1)) {
+ $result = $this->copy($path1, $path2);
+ if ($result === true) {
+ list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+ $result = $storage1->deleteAll($internalPath1);
+ }
+ } else {
+ $source = $this->fopen($path1 . $postFix1, 'r');
+ $target = $this->fopen($path2 . $postFix2, 'w');
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+ $storage1->unlink($internalPath1);
+ }
}
if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
\OC_Hook::emit(
@@ -406,7 +418,7 @@ class View {
\OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2)
and Filesystem::isValidPath($path2)
and Filesystem::isValidPath($path1)
- and ! Filesystem::isFileBlacklisted($path2)
+ and !Filesystem::isFileBlacklisted($path2)
) {
$path1 = $this->getRelativePath($absolutePath1);
$path2 = $this->getRelativePath($absolutePath2);
@@ -459,9 +471,18 @@ class View {
$result = false;
}
} else {
- $source = $this->fopen($path1 . $postFix1, 'r');
- $target = $this->fopen($path2 . $postFix2, 'w');
- list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
+ $result = $this->mkdir($path2);
+ while ($file = readdir($dh)) {
+ if (!Filesystem::isIgnoredDir($file)) {
+ $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ }
+ }
+ } else {
+ $source = $this->fopen($path1 . $postFix1, 'r');
+ $target = $this->fopen($path2 . $postFix2, 'w');
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ }
}
if ($this->fakeRoot == Filesystem::getRoot()) {
\OC_Hook::emit(
@@ -611,7 +632,7 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam)
and Filesystem::isValidPath($path)
- and ! Filesystem::isFileBlacklisted($path)
+ and !Filesystem::isFileBlacklisted($path)
) {
$path = $this->getRelativePath($absolutePath);
if ($path == null) {
@@ -738,6 +759,9 @@ class View {
$data['permissions'] = $permissions;
}
}
+
+ $data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);
+
return $data;
}
@@ -773,18 +797,18 @@ class View {
}
$files = $cache->getFolderContents($internalPath); //TODO: mimetype_filter
+ $permissions = $permissionsCache->getDirectoryPermissions($cache->getId($internalPath), $user);
$ids = array();
foreach ($files as $i => $file) {
$files[$i]['type'] = $file['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
$ids[] = $file['fileid'];
- $permissions = $permissionsCache->get($file['fileid'], $user);
- if ($permissions === -1) {
- $permissions = $storage->getPermissions($file['path']);
- $permissionsCache->set($file['fileid'], $user, $permissions);
+ if (!isset($permissions[$file['fileid']])) {
+ $permissions[$file['fileid']] = $storage->getPermissions($file['path']);
+ $permissionsCache->set($file['fileid'], $user, $permissions[$file['fileid']]);
}
- $files[$i]['permissions'] = $permissions;
+ $files[$i]['permissions'] = $permissions[$file['fileid']];
}
//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
diff --git a/lib/helper.php b/lib/helper.php
index c69445ed78823cc9dae27ebd439e93c23b24ddcb..225e9fd2a9a439e7903d1e6bbc8ddf0c08206078 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -27,6 +27,7 @@
class OC_Helper {
private static $mimetypes=array();
private static $tmpFiles=array();
+ private static $mimetypeIcons = array();
/**
* @brief Creates an url using a defined route
@@ -187,31 +188,38 @@ class OC_Helper {
*
* Returns the path to the image of this file type.
*/
- public static function mimetypeIcon( $mimetype ) {
- $alias=array('application/xml'=>'code/xml');
- if(isset($alias[$mimetype])) {
- $mimetype=$alias[$mimetype];
+ public static function mimetypeIcon($mimetype) {
+ $alias = array('application/xml' => 'code/xml');
+ if (isset($alias[$mimetype])) {
+ $mimetype = $alias[$mimetype];
+ }
+ if (isset(self::$mimetypeIcons[$mimetype])) {
+ return self::$mimetypeIcons[$mimetype];
}
// Replace slash and backslash with a minus
- $mimetype = str_replace( "/", "-", $mimetype );
- $mimetype = str_replace( "\\", "-", $mimetype );
+ $icon = str_replace('/', '-', $mimetype);
+ $icon = str_replace( '\\', '-', $icon);
// Is it a dir?
- if( $mimetype == "dir" ) {
- return OC::$WEBROOT."/core/img/filetypes/folder.png";
+ if ($mimetype === 'dir') {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/folder.png';
+ return OC::$WEBROOT.'/core/img/filetypes/folder.png';
}
// Icon exists?
- if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
- return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
- }
- //try only the first part of the filetype
- $mimetype=substr($mimetype, 0, strpos($mimetype, '-'));
- if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
- return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
+ if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$icon.'.png')) {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png';
+ return OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png';
}
- else{
- return OC::$WEBROOT."/core/img/filetypes/file.png";
+
+ // Try only the first part of the filetype
+ $mimePart = substr($icon, 0, strpos($icon, '-'));
+ if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$mimePart.'.png')) {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png';
+ return OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png';
+ } else {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/file.png';
+ return OC::$WEBROOT.'/core/img/filetypes/file.png';
}
}
diff --git a/lib/hooks/basicemitter.php b/lib/hooks/basicemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..e615a58cfe846c3fde3d4aaf1d6ffdaf2b8a65c9
--- /dev/null
+++ b/lib/hooks/basicemitter.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+abstract class BasicEmitter implements Emitter {
+
+ /**
+ * @var (callable[])[] $listeners
+ */
+ private $listeners = array();
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback) {
+ $eventName = $scope . '::' . $method;
+ if (!isset($this->listeners[$eventName])) {
+ $this->listeners[$eventName] = array();
+ }
+ if (array_search($callback, $this->listeners[$eventName]) === false) {
+ $this->listeners[$eventName][] = $callback;
+ }
+ }
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function removeListener($scope = null, $method = null, $callback = null) {
+ $names = array();
+ $allNames = array_keys($this->listeners);
+ if ($scope and $method) {
+ $name = $scope . '::' . $method;
+ if (isset($this->listeners[$name])) {
+ $names[] = $name;
+ }
+ } elseif ($scope) {
+ foreach ($allNames as $name) {
+ $parts = explode('::', $name, 2);
+ if ($parts[0] == $scope) {
+ $names[] = $name;
+ }
+ }
+ } elseif ($method) {
+ foreach ($allNames as $name) {
+ $parts = explode('::', $name, 2);
+ if ($parts[1] == $method) {
+ $names[] = $name;
+ }
+ }
+ } else {
+ $names = $allNames;
+ }
+
+ foreach ($names as $name) {
+ if ($callback) {
+ $index = array_search($callback, $this->listeners[$name]);
+ if ($index !== false) {
+ unset($this->listeners[$name][$index]);
+ }
+ } else {
+ $this->listeners[$name] = array();
+ }
+ }
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param array $arguments optional
+ */
+ protected function emit($scope, $method, $arguments = array()) {
+ $eventName = $scope . '::' . $method;
+ if (isset($this->listeners[$eventName])) {
+ foreach ($this->listeners[$eventName] as $callback) {
+ call_user_func_array($callback, $arguments);
+ }
+ }
+ }
+}
diff --git a/lib/hooks/emitter.php b/lib/hooks/emitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e9074bad67f9869070148c37832b7bab877a7c3
--- /dev/null
+++ b/lib/hooks/emitter.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+/**
+ * Class Emitter
+ *
+ * interface for all classes that are able to emit events
+ *
+ * @package OC\Hooks
+ */
+interface Emitter {
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback);
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function removeListener($scope = null, $method = null, $callback = null);
+}
diff --git a/lib/hooks/legacyemitter.php b/lib/hooks/legacyemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a2d16ace9a7ef8be7f2d8740e2a2b4437558802f
--- /dev/null
+++ b/lib/hooks/legacyemitter.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+abstract class LegacyEmitter extends BasicEmitter {
+ protected function emit($scope, $method, $arguments = array()) {
+ \OC_Hook::emit($scope, $method, $arguments);
+ parent::emit($scope, $method, $arguments);
+ }
+}
diff --git a/lib/hooks/publicemitter.php b/lib/hooks/publicemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..e2371713ac3fca9b8e4a265fd31ae3fe3d13cc56
--- /dev/null
+++ b/lib/hooks/publicemitter.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+class PublicEmitter extends BasicEmitter {
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param array $arguments optional
+ */
+ public function emit($scope, $method, $arguments = array()) {
+ parent::emit($scope, $method, $arguments);
+ }
+}
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 98b9608ce02bf2ae5b6e9774fe58619362386a1f..22c934e238d8c3f0b9448d5d53e2a0c10f80b32c 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s ادخل اسم خادم قاعدة البيانات",
"PostgreSQL username and/or password not valid" => "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
"You need to enter either an existing account or the administrator." => "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
-"Oracle username and/or password not valid" => "اسم المستخدم و/أو كلمة المرور لنظام Oracle غير صحيح",
"MySQL username and/or password not valid" => "اسم المستخدم و/أو كلمة المرور لنظام MySQL غير صحيح",
"DB Error: \"%s\"" => "خطأ في قواعد البيانات : \"%s\"",
"Offending command was: \"%s\"" => "الأمر المخالف كان : \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "احذف اسم المستخدم هذا من الـ MySQL",
"MySQL user '%s'@'%%' already exists" => "أسم المستخدم '%s'@'%%' الخاص بـ MySQL موجود مسبقا",
"Drop this user from MySQL." => "احذف اسم المستخدم هذا من الـ MySQL.",
+"Oracle username and/or password not valid" => "اسم المستخدم و/أو كلمة المرور لنظام Oracle غير صحيح",
"Offending command was: \"%s\", name: %s, password: %s" => "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
"MS SQL username and/or password not valid: %s" => "اسم المستخدم و/أو كلمة المرور لنظام MS SQL غير صحيح : %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 73a7fdce481e3c2c2cdc4d8e18dfcc5947d90241..2de4c0a6e68cb8fd930a0b10abaf8979ca745cf5 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -23,13 +23,13 @@
"%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни",
"PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола",
"You need to enter either an existing account or the administrator." => "Необходимо е да влезете в всъществуващ акаунт или като администратора",
-"Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
"MySQL username and/or password not valid" => "Невалидно MySQL потребителско име и/или парола",
"DB Error: \"%s\"" => "Грешка в базата от данни: \"%s\"",
"MySQL user '%s'@'localhost' exists already." => "MySQL потребителят '%s'@'localhost' вече съществува",
"Drop this user from MySQL" => "Изтриване на потребителя от MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL потребителят '%s'@'%%' вече съществува.",
"Drop this user from MySQL." => "Изтриване на потребителя от MySQL.",
+"Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
"MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
"Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
"seconds ago" => "преди секунди",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 028bf2343a7e15ac2f509d22dcccecc05a6eabbe..5c368a85b28f7e5d068bb9619947073d1cda1daf 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s establiu l'ordinador central de la base de dades.",
"PostgreSQL username and/or password not valid" => "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
"You need to enter either an existing account or the administrator." => "Heu d'escriure un compte existent o el d'administrador.",
-"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
+"Oracle connection could not be established" => "No s'ha pogut establir la connexió Oracle",
"MySQL username and/or password not valid" => "Nom d'usuari i/o contrasenya MySQL no vàlids",
"DB Error: \"%s\"" => "Error DB: \"%s\"",
"Offending command was: \"%s\"" => "L'ordre en conflicte és: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Elimina aquest usuari de MySQL",
"MySQL user '%s'@'%%' already exists" => "L'usuari MySQL '%s'@'%%' ja existeix",
"Drop this user from MySQL." => "Elimina aquest usuari de MySQL.",
+"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
"Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
"MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index e3007f687d998cd18dd04c061b4556f8bf1e5221..36469507d405bde117e513f5023a40d65ab4c81e 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -24,7 +24,6 @@
"%s set the database host." => "Zadejte název počítače s databází %s.",
"PostgreSQL username and/or password not valid" => "Uživatelské jméno, či heslo PostgreSQL není platné",
"You need to enter either an existing account or the administrator." => "Musíte zadat existující účet, či správce.",
-"Oracle username and/or password not valid" => "Uživatelské jméno, či heslo Oracle není platné",
"MySQL username and/or password not valid" => "Uživatelské jméno, či heslo MySQL není platné",
"DB Error: \"%s\"" => "Chyba DB: \"%s\"",
"Offending command was: \"%s\"" => "Podezřelý příkaz byl: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Zahodit uživatele z MySQL",
"MySQL user '%s'@'%%' already exists" => "Uživatel '%s'@'%%' již v MySQL existuje",
"Drop this user from MySQL." => "Zahodit uživatele z MySQL.",
+"Oracle username and/or password not valid" => "Uživatelské jméno, či heslo Oracle není platné",
"Offending command was: \"%s\", name: %s, password: %s" => "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s",
"MS SQL username and/or password not valid: %s" => "Uživatelské jméno, či heslo MSSQL není platné: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité.",
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index ab5623bbf446c2a059f01e83dbaa9cdc0fd566c2..b3503dcc5727a9b1498c94da30a6a5198b5fef1c 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s gosod gwesteiwr y gronfa ddata.",
"PostgreSQL username and/or password not valid" => "Enw a/neu gyfrinair PostgreSQL annilys",
"You need to enter either an existing account or the administrator." => "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
-"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
"MySQL username and/or password not valid" => "Enw a/neu gyfrinair MySQL annilys",
"DB Error: \"%s\"" => "Gwall DB: \"%s\"",
"Offending command was: \"%s\"" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Gollwng y defnyddiwr hwn o MySQL",
"MySQL user '%s'@'%%' already exists" => "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli",
"Drop this user from MySQL." => "Gollwng y defnyddiwr hwn o MySQL.",
+"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
"Offending command was: \"%s\", name: %s, password: %s" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
"MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index dad64700e52e9f2f1b66154cd60dfc38ed6397d0..aead17f510ef357c7d93b0d4f15db8c4685ff7b1 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s sæt database værten.",
"PostgreSQL username and/or password not valid" => "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
"You need to enter either an existing account or the administrator." => "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
-"Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
"MySQL username and/or password not valid" => "MySQL brugernavn og/eller kodeord er ikke gyldigt.",
"DB Error: \"%s\"" => "Databasefejl: \"%s\"",
"Offending command was: \"%s\"" => "Fejlende kommando var: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Slet denne bruger fra MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.",
"Drop this user from MySQL." => "Slet denne bruger fra MySQL",
+"Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
"Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 13acc1c55b50330d92fc16a7ff57eecd6c9bf782..74715bc66eb7f34f0e206d77f3f46c695cace52c 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s setze den Datenbank-Host",
"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
"You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 566e98b85ce42a4a69ed6f118fb978c660caee02..5ebe4fb26fc35b9300b3b5d1a18bb8470d9296f7 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s setze den Datenbank-Host",
"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
"You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
+"Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 14b63a8184c42edc0a21aa990f105dfe42a22190..8637b8da269b30f88f86a702655fa16af21563e4 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. ",
"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
"You need to enter either an existing account or the administrator." => "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
-"Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
"MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
"DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
"Offending command was: \"%s\"" => "Η εντολη παραβατικοτητας ηταν: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL",
"MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη",
"Drop this user from MySQL." => "Απόρριψη αυτού του χρήστη από την MySQL",
+"Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
"Offending command was: \"%s\", name: %s, password: %s" => "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
"MS SQL username and/or password not valid: %s" => "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index af96e693d1c39888795594138f2395d68dc3d37f..3b32036d3af7e898ae22b26b580d2536ec2ade54 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s ingresar el host de la base de datos.",
"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
+"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
"DB Error: \"%s\"" => "Error BD: \"%s\"",
"Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Eliminar este usuario de MySQL",
"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
"Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
+"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
"Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index e9da37e0a3d272413cca12ab56b7d5c851b1d2e1..1df1b16de658907cba26c001d8df2ea88b54c4cc 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s Especifique la dirección de la Base de Datos",
"PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña de PostgradeSQL no válido.",
"You need to enter either an existing account or the administrator." => "Debe ingresar una cuenta existente o el administrador",
-"Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
"MySQL username and/or password not valid" => "Usuario y/o contraseña MySQL no válido",
"DB Error: \"%s\"" => "Error DB: \"%s\"",
"Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Borrar este usuario de MySQL",
"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existente",
"Drop this user from MySQL." => "Borrar este usuario de MySQL",
+"Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
"Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 90c9c4168274a86ed40688d1e85fd5f185b6b69f..24fc98bde6429bb63445760f67e82e1e850fc780 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -9,7 +9,7 @@
"Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
"Back to Files" => "Tagasi failide juurde",
"Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
-"couldn't be determined" => "Ei suuda tuvastada",
+"couldn't be determined" => "ei suudetud tuvastada",
"Application is not enabled" => "Rakendus pole sisse lülitatud",
"Authentication error" => "Autentimise viga",
"Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
@@ -24,7 +24,7 @@
"%s set the database host." => "%s määra andmebaasi server.",
"PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
"You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
-"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
+"Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
"MySQL username and/or password not valid" => "MySQL kasutajatunnus ja/või parool pole õiged",
"DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
"Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Kustuta see kasutaja MySQL-ist",
"MySQL user '%s'@'%%' already exists" => "MySQL kasutaja '%s'@'%%' on juba olemas",
"Drop this user from MySQL." => "Kustuta see kasutaja MySQL-ist.",
+"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
"Offending command was: \"%s\", name: %s, password: %s" => "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 934a4d19ab5d3dcac077f89a55b97704261aea65..05b68b062c5a6c8c0ec5d81b59e4a4932f1a37e1 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s sartu datu basearen hostalaria.",
"PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
"You need to enter either an existing account or the administrator." => "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
-"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
"MySQL username and/or password not valid" => "MySQL erabiltzaile edota pasahitza ez dira egokiak.",
"DB Error: \"%s\"" => "DB errorea: \"%s\"",
"Offending command was: \"%s\"" => "Errorea komando honek sortu du: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Ezabatu erabiltzaile hau MySQLtik",
"MySQL user '%s'@'%%' already exists" => "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da",
"Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
+"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
"Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index c2e83f6616663db033ffb69d38a408b01209776a..0caa7b12df6d5ffc4c9a3a9dc24b5807e8d0c9b2 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -22,13 +22,14 @@
"%s enter the database name." => "%s anna tietokannan nimi.",
"%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
"PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
+"Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
"MySQL username and/or password not valid" => "MySQL:n käyttäjätunnus ja/tai salasana on väärin",
"DB Error: \"%s\"" => "Tietokantavirhe: \"%s\"",
"MySQL user '%s'@'localhost' exists already." => "MySQL-käyttäjä '%s'@'localhost' on jo olemassa.",
"Drop this user from MySQL" => "Pudota tämä käyttäjä MySQL:stä",
"MySQL user '%s'@'%%' already exists" => "MySQL-käyttäjä '%s'@'%%' on jo olemassa",
"Drop this user from MySQL." => "Pudota tämä käyttäjä MySQL:stä.",
+"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
"MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
"seconds ago" => "sekuntia sitten",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index c0920179dbb29e5ef137b319a24479f75a4b8ba7..aed5d056f370dc6af67db055595cc0a19cd16ce4 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s spécifiez l'hôte de la base de données.",
"PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
"You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
-"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
+"Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie",
"MySQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide",
"DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"",
"Offending command was: \"%s\"" => "La requête en cause est : \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Retirer cet utilisateur de la base MySQL",
"MySQL user '%s'@'%%' already exists" => "L'utilisateur MySQL '%s'@'%%' existe déjà",
"Drop this user from MySQL." => "Retirer cet utilisateur de la base MySQL.",
+"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
"Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 783826508c9f378bff954612e444954bff9cf004..1b4db4b30af86b704d60b400c12c1a9cfd3ec15c 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s estabeleza o servidor da base de datos",
"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
-"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
+"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Omitir este usuario de MySQL",
"MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
"Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 841020183b0f5c75d8d81f4c36b8a9624ebcae44..3b5c886bd2cb532b57224c5bb172cb3851a455cb 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s adja meg az adatbázist szolgáltató számítógép nevét.",
"PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
"You need to enter either an existing account or the administrator." => "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
-"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
+"Oracle connection could not be established" => "Az Oracle kapcsolat nem hozható létre",
"MySQL username and/or password not valid" => "A MySQL felhasználói név és/vagy jelszó érvénytelen",
"DB Error: \"%s\"" => "Adatbázis hiba: \"%s\"",
"Offending command was: \"%s\"" => "A hibát ez a parancs okozta: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Törölje ezt a felhasználót a MySQL-ből",
"MySQL user '%s'@'%%' already exists" => "A '%s'@'%%' MySQL felhasználó már létezik",
"Drop this user from MySQL." => "Törölje ezt a felhasználót a MySQL-ből.",
+"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
"Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 54b46cd8961d8a028ba532466008ecaec76c283f..29843a9532702c26ee0c83f51d6e7c6b38bd321d 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s setel host basis data.",
"PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
"You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
-"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
"MySQL username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL tidak valid",
"DB Error: \"%s\"" => "Galat Basis Data: \"%s\"",
"Offending command was: \"%s\"" => "Perintah yang bermasalah: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Hapus pengguna ini dari MySQL",
"MySQL user '%s'@'%%' already exists" => "Pengguna MySQL '%s'@'%%' sudah ada.",
"Drop this user from MySQL." => "Hapus pengguna ini dari MySQL.",
+"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
"Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
"MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak valid: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 1db48dbc80d27db17936d2876fea8d9f76f7fc47..db26ac82ae3422663b8f01e72010f14fdf269afd 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s imposta l'host del database.",
"PostgreSQL username and/or password not valid" => "Nome utente e/o password di PostgreSQL non validi",
"You need to enter either an existing account or the administrator." => "È necessario inserire un account esistente o l'amministratore.",
-"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
+"Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
"MySQL username and/or password not valid" => "Nome utente e/o password di MySQL non validi",
"DB Error: \"%s\"" => "Errore DB: \"%s\"",
"Offending command was: \"%s\"" => "Il comando non consentito era: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Elimina questo utente da MySQL",
"MySQL user '%s'@'%%' already exists" => "L'utente MySQL '%s'@'%%' esiste già",
"Drop this user from MySQL." => "Elimina questo utente da MySQL.",
+"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
"Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
"MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 3b97ffc431f7eec451fd0ee53dcf91d525c96dab..a2eb4bee67bc6c824c325dd165fe08823519c3a4 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s にデータベースホストを設定します。",
"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザ名もしくはパスワードは有効ではありません",
"You need to enter either an existing account or the administrator." => "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
-"Oracle username and/or password not valid" => "Oracleのユーザ名もしくはパスワードは有効ではありません",
+"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
"MySQL username and/or password not valid" => "MySQLのユーザ名もしくはパスワードは有効ではありません",
"DB Error: \"%s\"" => "DBエラー: \"%s\"",
"Offending command was: \"%s\"" => "違反コマンド: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "MySQLからこのユーザを削除",
"MySQL user '%s'@'%%' already exists" => "MySQLのユーザ '%s'@'%%' はすでに存在します。",
"Drop this user from MySQL." => "MySQLからこのユーザを削除する。",
+"Oracle username and/or password not valid" => "Oracleのユーザ名もしくはパスワードは有効ではありません",
"Offending command was: \"%s\", name: %s, password: %s" => "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index a55323832ecec6380a98a82bd1f75f1ed26ce1dd..93835e4ead7a69ba3f2b512bcc79061c260ffa86 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s მიუთითეთ ბაზის ჰოსტი.",
"PostgreSQL username and/or password not valid" => "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
"You need to enter either an existing account or the administrator." => "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი.",
-"Oracle username and/or password not valid" => "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
"MySQL username and/or password not valid" => "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
"DB Error: \"%s\"" => "DB შეცდომა: \"%s\"",
"Offending command was: \"%s\"" => "Offending ბრძანება იყო: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "წაშალე ეს მომხამრებელი MySQL–იდან",
"MySQL user '%s'@'%%' already exists" => "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს",
"Drop this user from MySQL." => "წაშალე ეს მომხამრებელი MySQL–იდან",
+"Oracle username and/or password not valid" => "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
"Offending command was: \"%s\", name: %s, password: %s" => "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 28b96c56e105a2066f30a63258e8b409d324334a..140c75af3ce66f6f8fed701000a116b3637e01b6 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s iestatiet datubāžu serveri.",
"PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
"You need to enter either an existing account or the administrator." => "Jums jāievada vai nu esošs vai administratora konts.",
-"Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
"MySQL username and/or password not valid" => "Nav derīga MySQL parole un/vai lietotājvārds",
"DB Error: \"%s\"" => "DB kļūda — “%s”",
"Offending command was: \"%s\"" => "Vainīgā komanda bija “%s”",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Izmest šo lietotāju no MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē",
"Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
+"Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
"Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
"MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index fc95561d3b4e9835af05c0c04a23670cb0ce1f7a..23146154c77b1228256c9602ec0c7763ce8d8441 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -15,6 +15,8 @@
"Files" => "Filer",
"Text" => "Tekst",
"Images" => "Bilder",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
"seconds ago" => "sekunder siden",
"1 minute ago" => "1 minutt siden",
"%d minutes ago" => "%d minutter siden",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 0c3871426190e4b99d295229ad3b92c87555f785..2a6086a5968fb3082830050909f777db76c34dff 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s instellen databaseservernaam.",
"PostgreSQL username and/or password not valid" => "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
"You need to enter either an existing account or the administrator." => "Geef of een bestaand account op of het beheerdersaccount.",
-"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
+"Oracle connection could not be established" => "Er kon geen verbinding met Oracle worden bereikt",
"MySQL username and/or password not valid" => "MySQL gebruikersnaam en/of wachtwoord ongeldig",
"DB Error: \"%s\"" => "DB Fout: \"%s\"",
"Offending command was: \"%s\"" => "Onjuiste commande was: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Verwijder deze gebruiker uit MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al",
"Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.",
+"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
"Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index f8f15c9fba613539c411805cb54b718b7a7ebe9c..8241573f9aeda9afeff0e54a914fa712045fdb70 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -3,7 +3,7 @@
"Personal" => "Personleg",
"Settings" => "Innstillingar",
"Users" => "Brukarar",
-"Apps" => "Applikasjonar",
+"Apps" => "Program",
"Admin" => "Administrer",
"Authentication error" => "Feil i autentisering",
"Files" => "Filer",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 4ac1c14439fde70664af0ff3096d732b589f82e7..53a9290785c9e200b3b83fbd3a3b89cdc4ba5232 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s ustaw hosta bazy danych.",
"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
"You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub administratora.",
-"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
"MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
"DB Error: \"%s\"" => "Błąd DB: \"%s\"",
"Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Usuń tego użytkownika z MySQL",
"MySQL user '%s'@'%%' already exists" => "Użytkownik MySQL '%s'@'%%t' już istnieje",
"Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
+"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
"Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s",
"MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 4c50f8de9e677f83331fab0710c27a20fa984783..9606477d945a1e9141dd55426d36cd7acb080a1b 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s defina o host do banco de dados.",
"PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
"You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou o administrador.",
-"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
+"Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
"MySQL username and/or password not valid" => "Nome de usuário e/ou senha MySQL inválido(s)",
"DB Error: \"%s\"" => "Erro no BD: \"%s\"",
"Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Derrubar este usuário do MySQL",
"MySQL user '%s'@'%%' already exists" => "Usuário MySQL '%s'@'%%' já existe",
"Drop this user from MySQL." => "Derrube este usuário do MySQL.",
+"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
"Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index b3befe96e03ef572b27222ed21dbeced03d6dce9..f49258157edba3f5d3302e8b35f88e7ec709e936 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s defina o servidor da base de dados (geralmente localhost)",
"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
"You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
-"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
+"Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
"MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida",
"DB Error: \"%s\"" => "Erro na BD: \"%s\"",
"Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Eliminar este utilizador do MySQL",
"MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe",
"Drop this user from MySQL." => "Eliminar este utilizador do MySQL",
+"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index e716f6d1c1149b74670a37c8679bfc736e0b47c2..e077b688c09333fb26761bc662fb1572671e97ef 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s задайте хост базы данных.",
"PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
"You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
-"Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
"MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
"DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
"Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Удалить этого пользователя из MySQL",
"MySQL user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует",
"Drop this user from MySQL." => "Удалить этого пользователя из MySQL.",
+"Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
"Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
"MS SQL username and/or password not valid: %s" => "Имя пользователя и/или пароль MS SQL не подходит: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index 8fb568aee7e274e415926675ddc7b4acdde660b0..7639a3cc97e4f605e1343ad34ee941cc1fddb2cb 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Settings" => "Настройки"
+"Settings" => "Настройки",
+"Text" => "Текст"
);
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index e074ed78c3c2272c34fd25da37b556c0b36063b6..c1ec2470b46c5bd08833f95338ccffe6efcd0fb2 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -24,7 +24,7 @@
"%s set the database host." => "Zadajte názov počítača s databázou %s.",
"PostgreSQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
"You need to enter either an existing account or the administrator." => "Musíte zadať jestvujúci účet alebo administrátora.",
-"Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
+"Oracle connection could not be established" => "Nie je možné pripojiť sa k Oracle",
"MySQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné",
"DB Error: \"%s\"" => "Chyba DB: \"%s\"",
"Offending command was: \"%s\"" => "Podozrivý príkaz bol: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Zahodiť používateľa z MySQL.",
"MySQL user '%s'@'%%' already exists" => "Používateľ '%s'@'%%' už v MySQL existuje",
"Drop this user from MySQL." => "Zahodiť používateľa z MySQL.",
+"Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
"Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
"MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 0c42f44d2aa6960ccffad4fbb494e4a55d03e3c7..7f8827d17f32c51f012be394d048a323b330781e 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s - vnos gostitelja podatkovne zbirke.",
"PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
"You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
-"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
"MySQL username and/or password not valid" => "Uporabniško ime ali geslo MySQL ni veljavno",
"DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"",
"Offending command was: \"%s\"" => "Napačni ukaz je: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Odstrani uporabnika s podatkovne zbirke MySQL",
"MySQL user '%s'@'%%' already exists" => "Uporabnik MySQL '%s'@'%%' že obstaja.",
"Drop this user from MySQL." => "Odstrani uporabnika s podatkovne zbirke MySQL",
+"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
"Offending command was: \"%s\", name: %s, password: %s" => "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
"MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index 60d83ca48c3861c69b878fa3ec6dc20f56c6ee66..04186f62102832ce82155034ee00e057c3b1e3e8 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s caktoni pozicionin (host) e database-it.",
"PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
"You need to enter either an existing account or the administrator." => "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
-"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
"MySQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm.",
"DB Error: \"%s\"" => "Veprim i gabuar i DB-it: \"%s\"",
"Offending command was: \"%s\"" => "Komanda e gabuar ishte: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Eliminoni këtë përdorues nga MySQL",
"MySQL user '%s'@'%%' already exists" => "Përdoruesi MySQL '%s'@'%%' ekziston",
"Drop this user from MySQL." => "Eliminoni këtë përdorues nga MySQL.",
+"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
"Offending command was: \"%s\", name: %s, password: %s" => "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
"MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 641da2447ee6340367f9de12056c5ebc33355e3a..7996447b95d39147df55eb53ec36ca25ee659f02 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s veritabanı sunucu adını tanımla",
"PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
"You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ",
-"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli değildir. ",
"MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli değil",
"DB Error: \"%s\"" => "DB Hata: ''%s''",
"Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Bu kullanici MySQLden list disari koymak. ",
"MySQL user '%s'@'%%' already exists" => "MySQL kullanici '%s @ % % zaten var (zaten yazili)",
"Drop this user from MySQL." => "Bu kulanıcıyı MySQL veritabanından kaldır",
+"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli değildir. ",
"Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index a544890124756a1080718de168baf7b6451c5f8b..676879629ef37fbbe7cca86f41227d57643594d0 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s встановити хост бази даних.",
"PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
"You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
-"Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
"MySQL username and/or password not valid" => "MySQL ім'я користувача та/або пароль не дійсні",
"DB Error: \"%s\"" => "Помилка БД: \"%s\"",
"Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Видалити цього користувача з MySQL",
"MySQL user '%s'@'%%' already exists" => "Користувач MySQL '%s'@'%%' вже існує",
"Drop this user from MySQL." => "Видалити цього користувача з MySQL.",
+"Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
"Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index cab5142e5d5ea2de10a77a3aa89d1fb5fe3f61af..61e405d80583bda00531399302a1aee4edfe4c83 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s 设置数据库所在主机。",
"PostgreSQL username and/or password not valid" => "PostgreSQL 数据库用户名和/或密码无效",
"You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。",
-"Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
"MySQL username and/or password not valid" => "MySQL 数据库用户名和/或密码无效",
"DB Error: \"%s\"" => "数据库错误：\"%s\"",
"Offending command was: \"%s\"" => "冲突命令为：\"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "建议从 MySQL 数据库中丢弃 Drop 此用户",
"MySQL user '%s'@'%%' already exists" => "MySQL 用户 '%s'@'%%' 已存在",
"Drop this user from MySQL." => "建议从 MySQL 数据库中丢弃 Drop 此用户。",
+"Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
"Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为：\"%s\"，名称：%s，密码：%s",
"MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效：%s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 5affb1ccf352877fc6fc0e7bf0a8c33b8fd16cee..4e0d50e7fc9dc43ea7223ca9c658bbe7ab30a482 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s 設定資料庫主機。",
"PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效",
"You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。",
-"Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
+"Oracle connection could not be established" => "無法建立 Oracle 資料庫連線",
"MySQL username and/or password not valid" => "MySQL 用戶名和/或密碼無效",
"DB Error: \"%s\"" => "資料庫錯誤：\"%s\"",
"Offending command was: \"%s\"" => "有問題的指令是：\"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "在 MySQL 移除這個使用者",
"MySQL user '%s'@'%%' already exists" => "MySQL 使用者 '%s'@'%%' 已經存在",
"Drop this user from MySQL." => "在 MySQL 移除這個使用者。",
+"Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
"Offending command was: \"%s\", name: %s, password: %s" => "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
"MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
diff --git a/lib/mail.php b/lib/mail.php
index 61634632efce4c3bb2330b51fe422fc5c5085878..e15af277a640ee47962a3c070f789eb5e952d1c7 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -113,7 +113,7 @@ class OC_Mail {
*/
public static function getfooter() {
- $txt="\n--\n";
+ $txt="\n-- \n";
$txt.="ownCloud\n";
$txt.="Your Cloud, Your Data, Your Way!\n";
return($txt);
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 601046fe691dcf9146371699d060bb03f436b485..cc076a3a845ad2944721cc8346c686434475dc9c 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -1,49 +1,46 @@
<?php
/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Jakob Sack
+ * @copyright 2012 Jakob Sack owncloud@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
/**
- * Public interface of ownCloud forbackground jobs.
+ * Public interface of ownCloud for background jobs.
*/
// use OCP namespace for all classes that are considered public.
// This means that they should be used by apps instead of the internal ownCloud classes
namespace OCP;
+use \OC\BackgroundJob\JobList;
+
/**
- * This class provides functions to manage backgroundjobs in ownCloud
- *
- * There are two kind of background jobs in ownCloud: regular tasks and
- * queued tasks.
+ * This class provides functions to register backgroundjobs in ownCloud
*
- * Regular tasks have to be registered in appinfo.php and
- * will run on a regular base. Fetching news could be a task that should run
- * frequently.
+ * To create a new backgroundjob create a new class that inharits from either \OC\BackgroundJob\Job,
+ * \OC\BackgroundJob\QueuedJob or \OC\BackgroundJob\TimedJob and register it using
+ * \OCP\BackgroundJob->registerJob($job, $argument), $argument will be passed to the run() function
+ * of the job when the job is executed.
*
- * Queued tasks have to be registered each time you want to execute them.
- * An example of the queued task would be the creation of the thumbnail. As
- * soon as the user uploads a picture the gallery app registers the queued
- * task "create thumbnail" and saves the path in the parameter instead of doing
- * the work right away. This makes the app more responsive. As soon as the task
- * is done it will be deleted from the list.
+ * A regular Job will be executed every time cron.php is run, a QueuedJob will only run once and a TimedJob
+ * will only run at a specific interval which is to be specified in the constructor of the job by calling
+ * $this->setInterval($interval) with $interval in seconds.
*/
class BackgroundJob {
/**
@@ -59,82 +56,136 @@ class BackgroundJob {
/**
* @brief sets the background jobs execution type
- * @param $type execution type
+ * @param string $type execution type
* @return boolean
*
* This method sets the execution type of the background jobs. Possible types
* are "none", "ajax", "webcron", "cron"
*/
- public static function setExecutionType( $type ) {
- return \OC_BackgroundJob::setExecutionType( $type );
+ public static function setExecutionType($type) {
+ return \OC_BackgroundJob::setExecutionType($type);
+ }
+
+ /**
+ * @param \OC\BackgroundJob\Job|string $job
+ * @param mixed $argument
+ */
+ public static function registerJob($job, $argument = null) {
+ $jobList = new JobList();
+ $jobList->add($job, $argument);
}
/**
+ * @deprecated
* @brief creates a regular task
- * @param $klass class name
- * @param $method method name
+ * @param string $klass class name
+ * @param string $method method name
* @return true
*/
- public static function addRegularTask( $klass, $method ) {
- return \OC_BackgroundJob_RegularTask::register( $klass, $method );
+ public static function addRegularTask($klass, $method) {
+ self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
+ return true;
}
/**
+ * @deprecated
* @brief gets all regular tasks
* @return associative array
*
* key is string "$klass-$method", value is array( $klass, $method )
*/
static public function allRegularTasks() {
- return \OC_BackgroundJob_RegularTask::all();
+ $jobList = new JobList();
+ $allJobs = $jobList->getAll();
+ $regularJobs = array();
+ foreach ($allJobs as $job) {
+ if ($job instanceof RegularLegacyJob) {
+ $key = implode('-', $job->getArgument());
+ $regularJobs[$key] = $job->getArgument();
+ }
+ }
+ return $regularJobs;
}
/**
+ * @deprecated
* @brief Gets one queued task
- * @param $id ID of the task
+ * @param int $id ID of the task
* @return associative array
*/
- public static function findQueuedTask( $id ) {
- return \OC_BackgroundJob_QueuedTask::find( $id );
+ public static function findQueuedTask($id) {
+ $jobList = new JobList();
+ return $jobList->getById($id);
}
/**
+ * @deprecated
* @brief Gets all queued tasks
* @return array with associative arrays
*/
public static function allQueuedTasks() {
- return \OC_BackgroundJob_QueuedTask::all();
+ $jobList = new JobList();
+ $allJobs = $jobList->getAll();
+ $queuedJobs = array();
+ foreach ($allJobs as $job) {
+ if ($job instanceof QueuedLegacyJob) {
+ $queuedJob = $job->getArgument();
+ $queuedJob['id'] = $job->getId();
+ $queuedJobs[] = $queuedJob;
+ }
+ }
+ return $queuedJobs;
}
/**
+ * @deprecated
* @brief Gets all queued tasks of a specific app
- * @param $app app name
+ * @param string $app app name
* @return array with associative arrays
*/
- public static function queuedTaskWhereAppIs( $app ) {
- return \OC_BackgroundJob_QueuedTask::whereAppIs( $app );
+ public static function queuedTaskWhereAppIs($app) {
+ $jobList = new JobList();
+ $allJobs = $jobList->getAll();
+ $queuedJobs = array();
+ foreach ($allJobs as $job) {
+ if ($job instanceof QueuedLegacyJob) {
+ $queuedJob = $job->getArgument();
+ $queuedJob['id'] = $job->getId();
+ if ($queuedJob['app'] === $app) {
+ $queuedJobs[] = $queuedJob;
+ }
+ }
+ }
+ return $queuedJobs;
}
/**
+ * @deprecated
* @brief queues a task
- * @param $app app name
- * @param $klass class name
- * @param $method method name
- * @param $parameters all useful data as text
- * @return id of task
+ * @param string $app app name
+ * @param string $class class name
+ * @param string $method method name
+ * @param string $parameters all useful data as text
+ * @return int id of task
*/
- public static function addQueuedTask( $app, $klass, $method, $parameters ) {
- return \OC_BackgroundJob_QueuedTask::add( $app, $klass, $method, $parameters );
+ public static function addQueuedTask($app, $class, $method, $parameters) {
+ self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
+ return true;
}
/**
+ * @deprecated
* @brief deletes a queued task
- * @param $id id of task
- * @return true/false
+ * @param int $id id of task
+ * @return bool
*
* Deletes a report
*/
- public static function deleteQueuedTask( $id ) {
- return \OC_BackgroundJob_QueuedTask::delete( $id );
+ public static function deleteQueuedTask($id) {
+ $jobList = new JobList();
+ $job = $jobList->getById($id);
+ if ($job) {
+ $jobList->remove($job);
+ }
}
}
diff --git a/lib/public/share.php b/lib/public/share.php
index a561319e9bdaa247b92a244a0f98754df63f7674..81f5515bb4ba1d50522d9a00a364c71aa69c3e7d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -106,6 +106,125 @@ class Share {
}
return false;
}
+
+ /**
+ * @brief Prepare a path to be passed to DB as file_target
+ * @return string Prepared path
+ */
+ public static function prepFileTarget( $path ) {
+
+ // Paths in DB are stored with leading slashes, so add one if necessary
+ if ( substr( $path, 0, 1 ) !== '/' ) {
+
+ $path = '/' . $path;
+
+ }
+
+ return $path;
+
+ }
+
+ /**
+ * @brief Find which users can access a shared item
+ * @param $path to the file
+ * @param $user owner of the file
+ * @param include owner to the list of users with access to the file
+ * @return array
+ * @note $path needs to be relative to user data dir, e.g. 'file.txt'
+ * not '/admin/data/file.txt'
+ */
+ public static function getUsersSharingFile($path, $user, $includeOwner = false) {
+
+ $shares = array();
+ $publicShare = false;
+ $source = -1;
+ $cache = false;
+
+ $view = new \OC\Files\View('/' . $user . '/files/');
+ $meta = $view->getFileInfo(\OC\Files\Filesystem::normalizePath($path));
+
+ if($meta !== false) {
+ $source = $meta['fileid'];
+ $cache = new \OC\Files\Cache\Cache($meta['storage']);
+ }
+
+ while ($source !== -1) {
+
+ // Fetch all shares of this file path from DB
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ?'
+ );
+
+ $result = $query->execute(array($source, self::SHARE_TYPE_USER));
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+ } else {
+ while ($row = $result->fetchRow()) {
+ $shares[] = $row['share_with'];
+ }
+ }
+ // We also need to take group shares into account
+
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ?'
+ );
+
+ $result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+ } else {
+ while ($row = $result->fetchRow()) {
+ $usersInGroup = \OC_Group::usersInGroup($row['share_with']);
+ $shares = array_merge($shares, $usersInGroup);
+ }
+ }
+
+ //check for public link shares
+ if (!$publicShare) {
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ?'
+ );
+
+ $result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+ } else {
+ if ($result->fetchRow()) {
+ $publicShare = true;
+ }
+ }
+ }
+
+ // let's get the parent for the next round
+ $meta = $cache->get((int)$source);
+ if($meta !== false) {
+ $source = (int)$meta['parent'];
+ } else {
+ $source = -1;
+ }
+ }
+ // Include owner in list of users, if requested
+ if ($includeOwner) {
+ $shares[] = $user;
+ }
+
+ return array("users" => array_unique($shares), "public" => $publicShare);
+ }
/**
* @brief Get the items of item type shared with the current user
@@ -132,7 +251,7 @@ class Share {
return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
$parameters, 1, $includeCollections);
}
-
+
/**
* @brief Get the item of item type shared with the current user by source
* @param string Item type
@@ -409,8 +528,16 @@ class Share {
'fileSource' => $item['file_source'],
'shareType' => $shareType,
'shareWith' => $shareWith,
+ 'itemParent' => $item['parent'],
));
self::delete($item['id']);
+ \OC_Hook::emit('OCP\Share', 'post_unshare', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith,
+ 'itemParent' => $item['parent'],
+ ));
return true;
}
return false;
@@ -433,6 +560,11 @@ class Share {
foreach ($shares as $share) {
self::delete($share['id']);
}
+ \OC_Hook::emit('OCP\Share', 'post_unshareAll', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'shares' => $shares
+ ));
return true;
}
return false;
@@ -877,7 +1009,7 @@ class Share {
if (!isset($mounts[$row['storage']])) {
$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
if (is_array($mountPoints)) {
- $mounts[$row['storage']] = $mountPoints[key($mountPoints)];
+ $mounts[$row['storage']] = current($mountPoints);
}
}
if ($mounts[$row['storage']]) {
@@ -1089,6 +1221,17 @@ class Share {
if ($shareType == self::SHARE_TYPE_GROUP) {
$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
$uidOwner, $suggestedItemTarget);
+ \OC_Hook::emit('OCP\Share', 'pre_shared', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $groupItemTarget,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith['group'],
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'fileSource' => $fileSource,
+ 'token' => $token
+ ));
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
@@ -1164,6 +1307,17 @@ class Share {
} else {
$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
$suggestedItemTarget);
+ \OC_Hook::emit('OCP\Share', 'pre_shared', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $itemTarget,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith,
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'fileSource' => $fileSource,
+ 'token' => $token
+ ));
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
diff --git a/lib/session/internal.php b/lib/session/internal.php
new file mode 100644
index 0000000000000000000000000000000000000000..60aecccc8aac255ec08fb7f83cf4b572160c6fe9
--- /dev/null
+++ b/lib/session/internal.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Session;
+
+/**
+ * Class Internal
+ *
+ * wrap php's internal session handling into the Session interface
+ *
+ * @package OC\Session
+ */
+class Internal extends Memory {
+ public function __construct($name) {
+ session_name($name);
+ session_start();
+ if (!isset($_SESSION)) {
+ throw new \Exception('Failed to start session');
+ }
+ $this->data = $_SESSION;
+ }
+
+ public function __destruct() {
+ $_SESSION = $this->data;
+ session_write_close();
+ }
+
+ public function clear() {
+ session_unset();
+ @session_regenerate_id(true);
+ @session_start();
+ $this->data = $_SESSION = array();
+ }
+}
diff --git a/lib/session/memory.php b/lib/session/memory.php
new file mode 100644
index 0000000000000000000000000000000000000000..c148ff4b9b9928af848b7895e9132ce02ea73bd0
--- /dev/null
+++ b/lib/session/memory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Session;
+
+/**
+ * Class Internal
+ *
+ * store session data in an in-memory array, not persistance
+ *
+ * @package OC\Session
+ */
+class Memory extends Session {
+ protected $data;
+
+ public function __construct($name) {
+ //no need to use $name since all data is already scoped to this instance
+ $this->data = array();
+ }
+
+ /**
+ * @param string $key
+ * @param mixed $value
+ */
+ public function set($key, $value) {
+ $this->data[$key] = $value;
+ }
+
+ /**
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key) {
+ if (!$this->exists($key)) {
+ return null;
+ }
+ return $this->data[$key];
+ }
+
+ /**
+ * @param string $key
+ * @return bool
+ */
+ public function exists($key) {
+ return isset($this->data[$key]);
+ }
+
+ /**
+ * @param string $key
+ */
+ public function remove($key) {
+ unset($this->data[$key]);
+ }
+
+ public function clear() {
+ $this->data = array();
+ }
+}
diff --git a/lib/session/session.php b/lib/session/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..55515f57a87d186adb11c407655b50f943350eda
--- /dev/null
+++ b/lib/session/session.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Session;
+
+abstract class Session implements \ArrayAccess {
+ /**
+ * $name serves as a namespace for the session keys
+ *
+ * @param string $name
+ */
+ abstract public function __construct($name);
+
+ /**
+ * @param string $key
+ * @param mixed $value
+ */
+ abstract public function set($key, $value);
+
+ /**
+ * @param string $key
+ * @return mixed should return null if $key does not exist
+ */
+ abstract public function get($key);
+
+ /**
+ * @param string $key
+ * @return bool
+ */
+ abstract public function exists($key);
+
+ /**
+ * should not throw any errors if $key does not exist
+ *
+ * @param string $key
+ */
+ abstract public function remove($key);
+
+ /**
+ * removes all entries within the cache namespace
+ */
+ abstract public function clear();
+
+ /**
+ * @param mixed $offset
+ * @return bool
+ */
+ public function offsetExists($offset) {
+ return $this->exists($offset);
+ }
+
+ /**
+ * @param mixed $offset
+ * @return mixed
+ */
+ public function offsetGet($offset) {
+ return $this->get($offset);
+ }
+
+ /**
+ * @param mixed $offset
+ * @param mixed $value
+ */
+ public function offsetSet($offset, $value) {
+ $this->set($offset, $value);
+ }
+
+ /**
+ * @param mixed $offset
+ */
+ public function offsetUnset($offset) {
+ $this->remove($offset);
+ }
+}
diff --git a/lib/setup.php b/lib/setup.php
index 376b71fc03b451c16a8443c6c3a512172d19d6cf..fd22141f1b9577b439ed7d262330b22aa36ebde1 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -138,8 +138,12 @@ class OC_Setup {
self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username);
} catch (Exception $e) {
$error[] = array(
- 'error' => $l->t('Oracle username and/or password not valid'),
- 'hint' => $l->t('You need to enter either an existing account or the administrator.')
+ 'error' => $l->t('Oracle connection could not be established'),
+ 'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+ .' ORACLE_SID='.getenv('ORACLE_SID')
+ .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+ .' NLS_LANG='.getenv('NLS_LANG')
+ .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'
);
return $error;
}
@@ -438,9 +442,13 @@ class OC_Setup {
} else {
$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
}
+ \OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
if(!$connection) {
$e = oci_error();
+ if (is_array ($e) && isset ($e['message'])) {
+ throw new Exception($e['message']);
+ }
throw new Exception($l->t('Oracle username and/or password not valid'));
}
//check for roles creation rights in oracle
diff --git a/lib/template.php b/lib/template.php
index 2f53533564880ed73d342f04489a8d43cb89cbeb..9467dedb62aac43c34f31480cb6efac051771232 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -246,14 +246,14 @@ class OC_Template{
// if the formfactor is not yet autodetected do the
// autodetection now. For possible formfactors check the
// detectFormfactor documentation
- if(!isset($_SESSION['formfactor'])) {
- $_SESSION['formfactor'] = self::detectFormfactor();
+ if (!\OC::$session->exists('formfactor')) {
+ \OC::$session->set('formfactor', self::detectFormfactor());
}
// allow manual override via GET parameter
if(isset($_GET['formfactor'])) {
- $_SESSION['formfactor']=$_GET['formfactor'];
+ \OC::$session->set('formfactor', $_GET['formfactor']);
}
- $formfactor=$_SESSION['formfactor'];
+ $formfactor = \OC::$session->get('formfactor');
if($formfactor=='default') {
$fext='';
}elseif($formfactor=='mobile') {
diff --git a/lib/user.php b/lib/user.php
index 226b716188d3c71cfbc8b2bdd28198df164e9347..503ac3f749327eea5328a34551e8940a5b9fc62e 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -30,35 +30,85 @@
* post_createUser(uid, password)
* pre_deleteUser(&run, uid)
* post_deleteUser(uid)
- * pre_setPassword(&run, uid, password)
- * post_setPassword(uid, password)
- * pre_login(&run, uid)
+ * pre_setPassword(&run, uid, password, recoveryPassword)
+ * post_setPassword(uid, password, recoveryPassword)
+ * pre_login(&run, uid, password)
* post_login(uid)
* logout()
*/
class OC_User {
- // The backend used for user management
- private static $_usedBackends = array();
+ public static $userSession = null;
+
+ private static function getUserSession() {
+ if (!self::$userSession) {
+ $manager = new \OC\User\Manager();
+ self::$userSession = new \OC\User\Session($manager, \OC::$session);
+ self::$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+ \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
+ });
+ self::$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
+ });
+ self::$userSession->listen('\OC\User', 'preDelete', function ($user) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+ });
+ self::$userSession->listen('\OC\User', 'postDelete', function ($user) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
+ });
+ self::$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+ /** @var $user \OC\User\User */
+ OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+ });
+ self::$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+ /** @var $user \OC\User\User */
+ OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+ });
+ self::$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+ \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
+ });
+ self::$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+ });
+ self::$userSession->listen('\OC\User', 'logout', function () {
+ \OC_Hook::emit('OC_User', 'logout', array());
+ });
+ }
+ return self::$userSession;
+ }
- private static $_setupedBackends = array();
+ /**
+ * @return \OC\User\Manager
+ */
+ private static function getManager() {
+ return self::getUserSession()->getManager();
+ }
- // Backends available (except database)
private static $_backends = array();
+ private static $_usedBackends = array();
+
+ private static $_setupedBackends = array();
+
/**
* @brief registers backend
- * @param $name name of the backend
- * @returns true/false
+ * @param string $backend name of the backend
+ * @deprecated Add classes by calling useBackend with a class instance instead
+ * @return bool
*
* Makes a list of backends that can be used by other modules
*/
- public static function registerBackend( $backend ) {
+ public static function registerBackend($backend) {
self::$_backends[] = $backend;
return true;
}
/**
* @brief gets available backends
+ * @deprecated
* @returns array of backends
*
* Returns the names of all backends.
@@ -69,6 +119,7 @@ class OC_User {
/**
* @brief gets used backends
+ * @deprecated
* @returns array of backends
*
* Returns the names of all used backends.
@@ -79,33 +130,36 @@ class OC_User {
/**
* @brief Adds the backend to the list of used backends
- * @param $backend default: database The backend to use for user managment
- * @returns true/false
+ * @param string | OC_User_Backend $backend default: database The backend to use for user management
+ * @return bool
*
* Set the User Authentication Module
*/
- public static function useBackend( $backend = 'database' ) {
- if($backend instanceof OC_User_Interface) {
- OC_Log::write('core', 'Adding user backend instance of '.get_class($backend).'.', OC_Log::DEBUG);
- self::$_usedBackends[get_class($backend)]=$backend;
+ public static function useBackend($backend = 'database') {
+ if ($backend instanceof OC_User_Interface) {
+ OC_Log::write('core', 'Adding user backend instance of ' . get_class($backend) . '.', OC_Log::DEBUG);
+ self::$_usedBackends[get_class($backend)] = $backend;
+ self::getManager()->registerBackend($backend);
} else {
// You'll never know what happens
- if( null === $backend OR !is_string( $backend )) {
+ if (null === $backend OR !is_string($backend)) {
$backend = 'database';
}
// Load backend
- switch( $backend ) {
+ switch ($backend) {
case 'database':
case 'mysql':
case 'sqlite':
- OC_Log::write('core', 'Adding user backend '.$backend.'.', OC_Log::DEBUG);
+ OC_Log::write('core', 'Adding user backend ' . $backend . '.', OC_Log::DEBUG);
self::$_usedBackends[$backend] = new OC_User_Database();
+ self::getManager()->registerBackend(self::$_usedBackends[$backend]);
break;
default:
- OC_Log::write('core', 'Adding default user backend '.$backend.'.', OC_Log::DEBUG);
+ OC_Log::write('core', 'Adding default user backend ' . $backend . '.', OC_Log::DEBUG);
$className = 'OC_USER_' . strToUpper($backend);
self::$_usedBackends[$backend] = new $className();
+ self::getManager()->registerBackend(self::$_usedBackends[$backend]);
break;
}
}
@@ -116,121 +170,73 @@ class OC_User {
* remove all used backends
*/
public static function clearBackends() {
- self::$_usedBackends=array();
+ self::$_usedBackends = array();
+ self::getManager()->clearBackends();
}
/**
* setup the configured backends in config.php
*/
public static function setupBackends() {
- $backends=OC_Config::getValue('user_backends', array());
- foreach($backends as $i=>$config) {
- $class=$config['class'];
- $arguments=$config['arguments'];
- if(class_exists($class)) {
- if(array_search($i, self::$_setupedBackends)===false) {
+ $backends = OC_Config::getValue('user_backends', array());
+ foreach ($backends as $i => $config) {
+ $class = $config['class'];
+ $arguments = $config['arguments'];
+ if (class_exists($class)) {
+ if (array_search($i, self::$_setupedBackends) === false) {
// make a reflection object
$reflectionObj = new ReflectionClass($class);
// use Reflection to create a new instance, using the $args
$backend = $reflectionObj->newInstanceArgs($arguments);
self::useBackend($backend);
- $_setupedBackends[]=$i;
+ $_setupedBackends[] = $i;
} else {
- OC_Log::write('core', 'User backend '.$class.' already initialized.', OC_Log::DEBUG);
+ OC_Log::write('core', 'User backend ' . $class . ' already initialized.', OC_Log::DEBUG);
}
} else {
- OC_Log::write('core', 'User backend '.$class.' not found.', OC_Log::ERROR);
+ OC_Log::write('core', 'User backend ' . $class . ' not found.', OC_Log::ERROR);
}
}
}
/**
* @brief Create a new user
- * @param $uid The username of the user to create
- * @param $password The password of the new user
- * @returns true/false
+ * @param string $uid The username of the user to create
+ * @param string $password The password of the new user
+ * @throws Exception
+ * @return bool true/false
*
* Creates a new user. Basic checking of username is done in OC_User
* itself, not in its subclasses.
*
* Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
*/
- public static function createUser( $uid, $password ) {
- // Check the name for bad characters
- // Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
- if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )) {
- throw new Exception('Only the following characters are allowed in a username:'
- .' "a-z", "A-Z", "0-9", and "_.@-"');
- }
- // No empty username
- if(trim($uid) == '') {
- throw new Exception('A valid username must be provided');
- }
- // No empty password
- if(trim($password) == '') {
- throw new Exception('A valid password must be provided');
- }
-
- // Check if user already exists
- if( self::userExistsForCreation($uid) ) {
- throw new Exception('The username is already being used');
- }
-
-
- $run = true;
- OC_Hook::emit( "OC_User", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password ));
-
- if( $run ) {
- //create the user in the first backend that supports creating users
- foreach(self::$_usedBackends as $backend) {
- if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER))
- continue;
-
- $backend->createUser($uid, $password);
- OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password ));
-
- return self::userExists($uid);
- }
- }
- return false;
+ public static function createUser($uid, $password) {
+ self::getManager()->createUser($uid, $password);
}
/**
* @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
+ * @param string $uid The username of the user to delete
+ * @return bool
*
* Deletes a user
*/
- public static function deleteUser( $uid ) {
- $run = true;
- OC_Hook::emit( "OC_User", "pre_deleteUser", array( "run" => &$run, "uid" => $uid ));
-
- if( $run ) {
- //delete the user from all backends
- foreach(self::$_usedBackends as $backend) {
- $backend->deleteUser($uid);
- }
- if (self::userExists($uid)) {
- return false;
- }
+ public static function deleteUser($uid) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ $user->delete();
+
// We have to delete the user from all groups
- foreach( OC_Group::getUserGroups( $uid ) as $i ) {
- OC_Group::removeFromGroup( $uid, $i );
+ foreach (OC_Group::getUserGroups($uid) as $i) {
+ OC_Group::removeFromGroup($uid, $i);
}
// Delete the user's keys in preferences
OC_Preferences::deleteUser($uid);
// Delete user files in /data/
- OC_Helper::rmdirr(OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/'.$uid.'/');
-
- // Emit and exit
- OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
- return true;
- }
- else{
- return false;
+ OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/');
}
}
@@ -238,75 +244,34 @@ class OC_User {
* @brief Try to login a user
* @param $uid The username of the user to log in
* @param $password The password of the user
- * @returns true/false
+ * @return bool
*
* Log in a user and regenerate a new session - if the password is ok
*/
- public static function login( $uid, $password ) {
- $run = true;
- OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
-
- if( $run ) {
- $uid = self::checkPassword( $uid, $password );
- $enabled = self::isEnabled($uid);
- if($uid && $enabled) {
- session_regenerate_id(true);
- self::setUserId($uid);
- self::setDisplayName($uid);
- OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
- return true;
- }
- }
- return false;
+ public static function login($uid, $password) {
+ return self::getUserSession()->login($uid, $password);
}
/**
* @brief Sets user id for session and triggers emit
*/
public static function setUserId($uid) {
- $_SESSION['user_id'] = $uid;
+ OC::$session->set('user_id', $uid);
}
/**
* @brief Sets user display name for session
*/
public static function setDisplayName($uid, $displayName = null) {
- $result = false;
- if ($displayName ) {
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {
- if($backend->userExists($uid)) {
- $result |= $backend->setDisplayName($uid, $displayName);
- }
- }
- }
- } else {
- $displayName = self::determineDisplayName($uid);
- $result = true;
+ if (is_null($displayName)) {
+ $displayName = $uid;
}
- if (OC_User::getUser() === $uid) {
- $_SESSION['display_name'] = $displayName;
- }
- return $result;
- }
-
-
- /**
- * @brief get display name
- * @param $uid The username
- * @returns string display name or uid if no display name is defined
- *
- */
- private static function determineDisplayName( $uid ) {
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
- $result=$backend->getDisplayName( $uid );
- if($result) {
- return $result;
- }
- }
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->setDisplayName($displayName);
+ } else {
+ return false;
}
- return $uid;
}
/**
@@ -315,36 +280,31 @@ class OC_User {
* Logout, destroys session
*/
public static function logout() {
- OC_Hook::emit( "OC_User", "logout", array());
- session_unset();
- session_destroy();
- OC_User::unsetMagicInCookie();
+ self::getUserSession()->logout();
}
/**
* @brief Check if the user is logged in
- * @returns true/false
+ * @returns bool
*
* Checks if the user is logged in
*/
public static function isLoggedIn() {
- if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
+ if (\OC::$session->get('user_id')) {
OC_App::loadApps(array('authentication'));
self::setupBackends();
- if (self::userExists($_SESSION['user_id']) ) {
- return true;
- }
+ return self::userExists(\OC::$session->get('user_id'));
}
return false;
}
/**
* @brief Check if the user is an admin user
- * @param $uid uid of the admin
- * @returns bool
+ * @param string $uid uid of the admin
+ * @return bool
*/
public static function isAdminUser($uid) {
- if(OC_Group::inGroup($uid, 'admin' )) {
+ if (OC_Group::inGroup($uid, 'admin')) {
return true;
}
return false;
@@ -356,32 +316,40 @@ class OC_User {
* @return string uid or false
*/
public static function getUser() {
- if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ) {
- return $_SESSION['user_id'];
- }
- else{
+ $uid = OC::$session->get('user_id');
+ if (!is_null($uid)) {
+ return $uid;
+ } else {
return false;
}
}
/**
* @brief get the display name of the user currently logged in.
+ * @param string $uid
* @return string uid or false
*/
- public static function getDisplayName($user=null) {
- if ( $user ) {
- return self::determineDisplayName($user);
- } else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
- return $_SESSION['display_name'];
- }
- else{
- return false;
+ public static function getDisplayName($uid = null) {
+ if ($uid) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->getDisplayName();
+ } else {
+ return $uid;
+ }
+ } else {
+ $user = self::getUserSession()->getUser();
+ if ($user) {
+ return $user->getDisplayName();
+ } else {
+ return false;
+ }
}
}
/**
* @brief Autogenerate a password
- * @returns string
+ * @return string
*
* generates a password
*/
@@ -391,111 +359,89 @@ class OC_User {
/**
* @brief Set password
- * @param $uid The username
- * @param $password The new password
- * @returns true/false
+ * @param string $uid The username
+ * @param string $password The new password
+ * @param string $recoveryPassword for the encryption app to reset encryption keys
+ * @return bool
*
* Change the password of a user
*/
- public static function setPassword( $uid, $password ) {
- $run = true;
- OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
-
- if( $run ) {
- $success = false;
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) {
- if($backend->userExists($uid)) {
- $success |= $backend->setPassword($uid, $password);
- }
- }
- }
- // invalidate all login cookies
- OC_Preferences::deleteApp($uid, 'login_token');
- OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password ));
- return $success;
- }
- else{
+ public static function setPassword($uid, $password, $recoveryPassword = null) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->setPassword($password, $recoveryPassword);
+ } else {
return false;
}
}
/**
* @brief Check whether user can change his password
- * @param $uid The username
- * @returns true/false
+ * @param string $uid The username
+ * @return bool
*
* Check whether a specified user can change his password
*/
public static function canUserChangePassword($uid) {
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) {
- if($backend->userExists($uid)) {
- return true;
- }
- }
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->canChangePassword();
+ } else {
+ return false;
}
- return false;
}
/**
* @brief Check whether user can change his display name
- * @param $uid The username
- * @returns true/false
+ * @param string $uid The username
+ * @return bool
*
* Check whether a specified user can change his display name
*/
public static function canUserChangeDisplayName($uid) {
- if (OC_Config::getValue('allow_user_to_change_display_name', true)) {
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {
- if($backend->userExists($uid)) {
- return true;
- }
- }
- }
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->canChangeDisplayName();
+ } else {
+ return false;
}
- return false;
}
/**
* @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns string
+ * @param string $uid The username
+ * @param string $password The password
+ * @return bool
*
* Check if the password is correct without logging in the user
* returns the user id or false
*/
- public static function checkPassword( $uid, $password ) {
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_CHECK_PASSWORD)) {
- $result=$backend->checkPassword( $uid, $password );
- if($result) {
- return $result;
- }
+ public static function checkPassword($uid, $password) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ if ($user->checkPassword($password)) {
+ return $user->getUID();
+ } else {
+ return false;
}
+ } else {
+ return false;
}
}
/**
- * @brief Check if the password is correct
* @param string $uid The username
- * @param string $password The password
- * @returns string
+ * @return string
*
* returns the path to the users home directory
*/
public static function getHome($uid) {
- foreach(self::$_usedBackends as $backend) {
- if($backend->implementsActions(OC_USER_BACKEND_GET_HOME) && $backend->userExists($uid)) {
- $result=$backend->getHome($uid);
- if($result) {
- return $result;
- }
- }
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->getHome();
+ } else {
+ return OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
}
- return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
}
/**
@@ -505,148 +451,93 @@ class OC_User {
* Get a list of all users.
*/
public static function getUsers($search = '', $limit = null, $offset = null) {
- $users = array();
- foreach (self::$_usedBackends as $backend) {
- $backendUsers = $backend->getUsers($search, $limit, $offset);
- if (is_array($backendUsers)) {
- $users = array_merge($users, $backendUsers);
- }
+ $users = self::getManager()->search($search, $limit, $offset);
+ $uids = array();
+ foreach ($users as $user) {
+ $uids[] = $user->getUID();
}
- asort($users);
- return $users;
+ return $uids;
}
/**
* @brief Get a list of all users display name
- * @returns associative array with all display names (value) and corresponding uids (key)
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array associative array with all display names (value) and corresponding uids (key)
*
* Get a list of all display names and user ids.
*/
public static function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = array();
- foreach (self::$_usedBackends as $backend) {
- $backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
- if (is_array($backendDisplayNames)) {
- $displayNames = $displayNames + $backendDisplayNames;
- }
+ $users = self::getManager()->searchDisplayName($search, $limit, $offset);
+ foreach ($users as $user) {
+ $displayNames[$user->getUID()] = $user->getDisplayName();
}
- asort($displayNames);
return $displayNames;
}
/**
* @brief check if a user exists
* @param string $uid the username
- * @param string $excludingBackend (default none)
* @return boolean
*/
- public static function userExists($uid, $excludingBackend=null) {
- foreach(self::$_usedBackends as $backend) {
- if (!is_null($excludingBackend) && !strcmp(get_class($backend), $excludingBackend)) {
- OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
- continue;
- }
- $result=$backend->userExists($uid);
- if($result===true) {
- return true;
- }
- }
- return false;
+ public static function userExists($uid) {
+ return self::getManager()->userExists($uid);
}
- public static function userExistsForCreation($uid) {
- foreach(self::$_usedBackends as $backend) {
- if(!$backend->hasUserListings())
- continue;
-
- $result=$backend->userExists($uid);
- if($result===true) {
- return true;
- }
- }
- return false;
- }
-
/**
* disables a user
- * @param string $userid the user to disable
+ *
+ * @param string $uid the user to disable
*/
- public static function disableUser($userid) {
- $sql = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
- $stmt = OC_DB::prepare($sql);
- if ( ! OC_DB::isError($stmt) ) {
- $result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
- if ( OC_DB::isError($result) ) {
- OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
- }
- } else {
- OC_Log::write('OC_User', 'could not disable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ public static function disableUser($uid) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ $user->setEnabled(false);
}
}
/**
* enable a user
- * @param string $userid
+ *
+ * @param string $uid
*/
- public static function enableUser($userid) {
- $sql = 'DELETE FROM `*PREFIX*preferences`'
- ." WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
- $stmt = OC_DB::prepare($sql);
- if ( ! OC_DB::isError($stmt) ) {
- $result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
- if ( OC_DB::isError($result) ) {
- OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
- }
- } else {
- OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ public static function enableUser($uid) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ $user->setEnabled(true);
}
}
/**
* checks if a user is enabled
- * @param string $userid
+ *
+ * @param string $uid
* @return bool
*/
- public static function isEnabled($userid) {
- $sql = 'SELECT `userid` FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?';
- $stmt = OC_DB::prepare($sql);
- if ( ! OC_DB::isError($stmt) ) {
- $result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
- if ( ! OC_DB::isError($result) ) {
- return $result->numRows() ? false : true;
- } else {
- OC_Log::write('OC_User',
- 'could not check if enabled: '. OC_DB::getErrorMessage($result),
- OC_Log::ERROR);
- }
+ public static function isEnabled($uid) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->isEnabled();
} else {
- OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ return false;
}
- return false;
}
/**
* @brief Set cookie value to use in next page load
* @param string $username username to be set
+ * @param string $token
*/
public static function setMagicInCookie($username, $token) {
- $secure_cookie = OC_Config::getValue("forcessl", false);
- $expires = time() + OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15);
- setcookie("oc_username", $username, $expires, OC::$WEBROOT, '', $secure_cookie);
- setcookie("oc_token", $token, $expires, OC::$WEBROOT, '', $secure_cookie, true);
- setcookie("oc_remember_login", true, $expires, OC::$WEBROOT, '', $secure_cookie);
+ self::getUserSession()->setMagicInCookie($username, $token);
}
/**
* @brief Remove cookie for "remember username"
*/
public static function unsetMagicInCookie() {
- unset($_COOKIE["oc_username"]);
- unset($_COOKIE["oc_token"]);
- unset($_COOKIE["oc_remember_login"]);
- setcookie("oc_username", null, -1);
- setcookie("oc_token", null, -1);
- setcookie("oc_remember_login", null, -1);
+ self::getUserSession()->unsetMagicInCookie();
}
}
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 93e8f17ca98ab460d2531dd35a3531b31cab6fbe..e9be08e429cb12b5ea06bfb0133fca668f37ac63 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -58,7 +58,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
/**
* @brief Get all supported actions
- * @returns bitwise-or'ed actions
+ * @return int bitwise-or'ed actions
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -76,8 +76,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
/**
* @brief Check if backend implements actions
- * @param $actions bitwise-or'ed actions
- * @returns boolean
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -87,12 +87,12 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
- *
- * Deletes a user
- */
+ * @brief delete a user
+ * @param string $uid The username of the user to delete
+ * @return bool
+ *
+ * Deletes a user
+ */
public function deleteUser( $uid ) {
return false;
}
@@ -127,8 +127,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
/**
* @brief get display name of the user
- * @param $uid user ID of the user
- * @return display name
+ * @param string $uid user ID of the user
+ * @return string display name
*/
public function getDisplayName($uid) {
return $uid;
diff --git a/lib/user/database.php b/lib/user/database.php
index 63c64ed43d393157ff2abb6635d3bdc5b2b26f03..d70b620f2abf055d9fd102fd36930bdce474f16f 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -136,7 +136,7 @@ class OC_User_Database extends OC_User_Backend {
*/
public function getDisplayName($uid) {
if( $this->userExists($uid) ) {
- $query = OC_DB::prepare( 'SELECT displayname FROM `*PREFIX*users` WHERE `uid` = ?' );
+ $query = OC_DB::prepare( 'SELECT `displayname` FROM `*PREFIX*users` WHERE `uid` = ?' );
$result = $query->execute( array( $uid ))->fetchAll();
$displayName = trim($result[0]['displayname'], ' ');
if ( !empty($displayName) ) {
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index d63f60efbeb53c0a1adb61e6ce8c5df789672957..b5b7a6c3c7ac7b135cc5abc0520a7d2b4246f155 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -1,114 +1,118 @@
<?php
/**
-* ownCloud
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
/**
* dummy user backend, does not keep state, only for testing use
*/
class OC_User_Dummy extends OC_User_Backend {
- private $users=array();
+ private $users = array();
+
/**
- * @brief Create a new user
- * @param $uid The username of the user to create
- * @param $password The password of the new user
- * @returns true/false
- *
- * Creates a new user. Basic checking of username is done in OC_User
- * itself, not in its subclasses.
- */
+ * @brief Create a new user
+ * @param string $uid The username of the user to create
+ * @param string $password The password of the new user
+ * @return bool
+ *
+ * Creates a new user. Basic checking of username is done in OC_User
+ * itself, not in its subclasses.
+ */
public function createUser($uid, $password) {
- if(isset($this->users[$uid])) {
+ if (isset($this->users[$uid])) {
return false;
- }else{
- $this->users[$uid]=$password;
+ } else {
+ $this->users[$uid] = $password;
return true;
}
}
/**
- * @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
- *
- * Deletes a user
- */
- public function deleteUser( $uid ) {
- if(isset($this->users[$uid])) {
+ * @brief delete a user
+ * @param string $uid The username of the user to delete
+ * @return bool
+ *
+ * Deletes a user
+ */
+ public function deleteUser($uid) {
+ if (isset($this->users[$uid])) {
unset($this->users[$uid]);
return true;
- }else{
+ } else {
return false;
}
}
/**
- * @brief Set password
- * @param $uid The username
- * @param $password The new password
- * @returns true/false
- *
- * Change the password of a user
- */
+ * @brief Set password
+ * @param string $uid The username
+ * @param string $password The new password
+ * @return bool
+ *
+ * Change the password of a user
+ */
public function setPassword($uid, $password) {
- if(isset($this->users[$uid])) {
- $this->users[$uid]=$password;
+ if (isset($this->users[$uid])) {
+ $this->users[$uid] = $password;
return true;
- }else{
+ } else {
return false;
}
}
/**
- * @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns string
- *
- * Check if the password is correct without logging in the user
- * returns the user id or false
- */
+ * @brief Check if the password is correct
+ * @param string $uid The username
+ * @param string $password The password
+ * @return string
+ *
+ * Check if the password is correct without logging in the user
+ * returns the user id or false
+ */
public function checkPassword($uid, $password) {
- if(isset($this->users[$uid])) {
- return ($this->users[$uid]==$password);
- }else{
+ if (isset($this->users[$uid])) {
+ return ($this->users[$uid] == $password);
+ } else {
return false;
}
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
- *
- * Get a list of all users.
- */
+ * @brief Get a list of all users
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array with all uids
+ *
+ * Get a list of all users.
+ */
public function getUsers($search = '', $limit = null, $offset = null) {
return array_keys($this->users);
}
/**
- * @brief check if a user exists
- * @param string $uid the username
- * @return boolean
- */
+ * @brief check if a user exists
+ * @param string $uid the username
+ * @return boolean
+ */
public function userExists($uid) {
return isset($this->users[$uid]);
}
diff --git a/lib/user/manager.php b/lib/user/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..d17cdf1a200790dcc815edfc1f231d1dcfd9e1d7
--- /dev/null
+++ b/lib/user/manager.php
@@ -0,0 +1,228 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\User;
+
+use OC\Hooks\PublicEmitter;
+
+/**
+ * Class Manager
+ *
+ * Hooks available in scope \OC\User:
+ * - preSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - postSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - preDelete(\OC\User\User $user)
+ * - postDelete(\OC\User\User $user)
+ * - preCreateUser(string $uid, string $password)
+ * - postCreateUser(\OC\User\User $user, string $password)
+ *
+ * @package OC\User
+ */
+class Manager extends PublicEmitter {
+ /**
+ * @var \OC_User_Backend[] $backends
+ */
+ private $backends = array();
+
+ private $cachedUsers = array();
+
+ public function __construct() {
+ $cachedUsers = $this->cachedUsers;
+ $this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
+ $i = array_search($user, $cachedUsers);
+ if ($i !== false) {
+ unset($cachedUsers[$i]);
+ }
+ });
+ }
+
+ /**
+ * register a user backend
+ *
+ * @param \OC_User_Backend $backend
+ */
+ public function registerBackend($backend) {
+ $this->backends[] = $backend;
+ }
+
+ /**
+ * remove a user backend
+ *
+ * @param \OC_User_Backend $backend
+ */
+ public function removeBackend($backend) {
+ $this->cachedUsers = array();
+ if (($i = array_search($backend, $this->backends)) !== false) {
+ unset($this->backends[$i]);
+ }
+ }
+
+ /**
+ * remove all user backends
+ */
+ public function clearBackends() {
+ $this->cachedUsers = array();
+ $this->backends = array();
+ }
+
+ /**
+ * get a user by user id
+ *
+ * @param string $uid
+ * @return \OC\User\User
+ */
+ public function get($uid) {
+ if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
+ return $this->cachedUsers[$uid];
+ }
+ foreach ($this->backends as $backend) {
+ if ($backend->userExists($uid)) {
+ return $this->getUserObject($uid, $backend);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * get or construct the user object
+ *
+ * @param string $uid
+ * @param \OC_User_Backend $backend
+ * @return \OC\User\User
+ */
+ protected function getUserObject($uid, $backend) {
+ if (isset($this->cachedUsers[$uid])) {
+ return $this->cachedUsers[$uid];
+ }
+ $this->cachedUsers[$uid] = new User($uid, $backend, $this);
+ return $this->cachedUsers[$uid];
+ }
+
+ /**
+ * check if a user exists
+ *
+ * @param string $uid
+ * @return bool
+ */
+ public function userExists($uid) {
+ $user = $this->get($uid);
+ return ($user !== null);
+ }
+
+ /**
+ * search by user id
+ *
+ * @param string $pattern
+ * @param int $limit
+ * @param int $offset
+ * @return \OC\User\User[]
+ */
+ public function search($pattern, $limit = null, $offset = null) {
+ $users = array();
+ foreach ($this->backends as $backend) {
+ $backendUsers = $backend->getUsers($pattern, $limit, $offset);
+ if (is_array($backendUsers)) {
+ foreach ($backendUsers as $uid) {
+ $users[] = $this->getUserObject($uid, $backend);
+ if (!is_null($limit)) {
+ $limit--;
+ }
+ if (!is_null($offset) and $offset > 0) {
+ $offset--;
+ }
+
+ }
+ }
+ }
+
+ usort($users, function ($a, $b) {
+ /**
+ * @var \OC\User\User $a
+ * @var \OC\User\User $b
+ */
+ return strcmp($a->getUID(), $b->getUID());
+ });
+ return $users;
+ }
+
+ /**
+ * search by displayName
+ *
+ * @param string $pattern
+ * @param int $limit
+ * @param int $offset
+ * @return \OC\User\User[]
+ */
+ public function searchDisplayName($pattern, $limit = null, $offset = null) {
+ $users = array();
+ foreach ($this->backends as $backend) {
+ $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+ if (is_array($backendUsers)) {
+ foreach ($backendUsers as $uid => $displayName) {
+ $users[] = $this->getUserObject($uid, $backend);
+ if (!is_null($limit)) {
+ $limit--;
+ }
+ if (!is_null($offset) and $offset > 0) {
+ $offset--;
+ }
+
+ }
+ }
+ }
+
+ usort($users, function ($a, $b) {
+ /**
+ * @var \OC\User\User $a
+ * @var \OC\User\User $b
+ */
+ return strcmp($a->getDisplayName(), $b->getDisplayName());
+ });
+ return $users;
+ }
+
+ /**
+ * @param string $uid
+ * @param string $password
+ * @throws \Exception
+ * @return bool | \OC\User\User the created user of false
+ */
+ public function createUser($uid, $password) {
+ // Check the name for bad characters
+ // Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
+ if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) {
+ throw new \Exception('Only the following characters are allowed in a username:'
+ . ' "a-z", "A-Z", "0-9", and "_.@-"');
+ }
+ // No empty username
+ if (trim($uid) == '') {
+ throw new \Exception('A valid username must be provided');
+ }
+ // No empty password
+ if (trim($password) == '') {
+ throw new \Exception('A valid password must be provided');
+ }
+
+ // Check if user already exists
+ if ($this->userExists($uid)) {
+ throw new \Exception('The username is already being used');
+ }
+
+ $this->emit('\OC\User', 'preCreateUser', array($uid, $password));
+ foreach ($this->backends as $backend) {
+ if ($backend->implementsActions(\OC_USER_BACKEND_CREATE_USER)) {
+ $backend->createUser($uid, $password);
+ $user = $this->getUserObject($uid, $backend);
+ $this->emit('\OC\User', 'postCreateUser', array($user, $password));
+ return $user;
+ }
+ }
+ return false;
+ }
+}
diff --git a/lib/user/session.php b/lib/user/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf93d9593afa8f76e4f55a5b6aceb149f6653934
--- /dev/null
+++ b/lib/user/session.php
@@ -0,0 +1,173 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\User;
+
+use OC\Hooks\Emitter;
+
+/**
+ * Class Session
+ *
+ * Hooks available in scope \OC\User:
+ * - preSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - postSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - preDelete(\OC\User\User $user)
+ * - postDelete(\OC\User\User $user)
+ * - preCreateUser(string $uid, string $password)
+ * - postCreateUser(\OC\User\User $user)
+ * - preLogin(string $user, string $password)
+ * - postLogin(\OC\User\User $user)
+ * - logout()
+ *
+ * @package OC\User
+ */
+class Session implements Emitter {
+ /**
+ * @var \OC\User\Manager $manager
+ */
+ private $manager;
+
+ /**
+ * @var \OC\Session\Session $session
+ */
+ private $session;
+
+ /**
+ * @var \OC\User\User $activeUser
+ */
+ protected $activeUser;
+
+ /**
+ * @param \OC\User\Manager $manager
+ * @param \OC\Session\Session $session
+ */
+ public function __construct($manager, $session) {
+ $this->manager = $manager;
+ $this->session = $session;
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback) {
+ $this->manager->listen($scope, $method, $callback);
+ }
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function removeListener($scope = null, $method = null, $callback = null) {
+ $this->manager->removeListener($scope, $method, $callback);
+ }
+
+ /**
+ * get the manager object
+ *
+ * @return \OC\User\Manager
+ */
+ public function getManager() {
+ return $this->manager;
+ }
+
+ /**
+ * set the currently active user
+ *
+ * @param \OC\User\User $user
+ */
+ public function setUser($user) {
+ if (is_null($user)) {
+ $this->session->remove('user_id');
+ } else {
+ $this->session->set('user_id', $user->getUID());
+ }
+ $this->activeUser = $user;
+ }
+
+ /**
+ * get the current active user
+ *
+ * @return \OC\User\User
+ */
+ public function getUser() {
+ if ($this->activeUser) {
+ return $this->activeUser;
+ } else {
+ $uid = $this->session->get('user_id');
+ if ($uid) {
+ $this->activeUser = $this->manager->get($uid);
+ return $this->activeUser;
+ } else {
+ return null;
+ }
+ }
+ }
+
+ /**
+ * try to login with the provided credentials
+ *
+ * @param string $uid
+ * @param string $password
+ * @return bool
+ */
+ public function login($uid, $password) {
+ $this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
+ $user = $this->manager->get($uid);
+ if ($user) {
+ $result = $user->checkPassword($password);
+ if ($result and $user->isEnabled()) {
+ $this->setUser($user);
+ $this->manager->emit('\OC\User', 'postLogin', array($user, $password));
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * logout the user from the session
+ */
+ public function logout() {
+ $this->manager->emit('\OC\User', 'logout');
+ $this->setUser(null);
+ $this->unsetMagicInCookie();
+ }
+
+ /**
+ * Set cookie value to use in next page load
+ *
+ * @param string $username username to be set
+ * @param string $token
+ */
+ public function setMagicInCookie($username, $token) {
+ $secure_cookie = \OC_Config::getValue("forcessl", false); //TODO: DI for cookies and OC_Config
+ $expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+ setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie);
+ setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true);
+ setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie);
+ }
+
+ /**
+ * Remove cookie for "remember username"
+ */
+ public function unsetMagicInCookie() {
+ unset($_COOKIE["oc_username"]); //TODO: DI
+ unset($_COOKIE["oc_token"]);
+ unset($_COOKIE["oc_remember_login"]);
+ setcookie("oc_username", null, -1);
+ setcookie("oc_token", null, -1);
+ setcookie("oc_remember_login", null, -1);
+ }
+}
diff --git a/lib/user/user.php b/lib/user/user.php
new file mode 100644
index 0000000000000000000000000000000000000000..f9466b71499ff638e8d10e9293839b8d8bc77983
--- /dev/null
+++ b/lib/user/user.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\User;
+
+use OC\Hooks\Emitter;
+
+class User {
+ /**
+ * @var string $uid
+ */
+ private $uid;
+
+ /**
+ * @var string $displayName
+ */
+ private $displayName;
+
+ /**
+ * @var \OC_User_Backend $backend
+ */
+ private $backend;
+
+ /**
+ * @var bool $enabled
+ */
+ private $enabled;
+
+ /**
+ * @var Emitter | Manager $emitter
+ */
+ private $emitter;
+
+ /**
+ * @param string $uid
+ * @param \OC_User_Backend $backend
+ * @param Emitter $emitter
+ */
+ public function __construct($uid, $backend, $emitter = null) {
+ $this->uid = $uid;
+ if ($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+ $this->displayName = $backend->getDisplayName($uid);
+ } else {
+ $this->displayName = $uid;
+ }
+ $this->backend = $backend;
+ $this->emitter = $emitter;
+ $enabled = \OC_Preferences::getValue($uid, 'core', 'enabled', 'true'); //TODO: DI for OC_Preferences
+ $this->enabled = ($enabled === 'true');
+ }
+
+ /**
+ * get the user id
+ *
+ * @return string
+ */
+ public function getUID() {
+ return $this->uid;
+ }
+
+ /**
+ * get the displayname for the user, if no specific displayname is set it will fallback to the user id
+ *
+ * @return string
+ */
+ public function getDisplayName() {
+ return $this->displayName;
+ }
+
+ /**
+ * set the displayname for the user
+ *
+ * @param string $displayName
+ * @return bool
+ */
+ public function setDisplayName($displayName) {
+ if ($this->canChangeDisplayName()) {
+ $this->displayName = $displayName;
+ $result = $this->backend->setDisplayName($this->uid, $displayName);
+ return $result !== false;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Delete the user
+ *
+ * @return bool
+ */
+ public function delete() {
+ if ($this->emitter) {
+ $this->emitter->emit('\OC\User', 'preDelete', array($this));
+ }
+ $result = $this->backend->deleteUser($this->uid);
+ if ($this->emitter) {
+ $this->emitter->emit('\OC\User', 'postDelete', array($this));
+ }
+ return !($result === false);
+ }
+
+ /**
+ * Check if the password is valid for the user
+ *
+ * @param $password
+ * @return bool
+ */
+ public function checkPassword($password) {
+ if ($this->backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
+ $result = $this->backend->checkPassword($this->uid, $password);
+ if ($result !== false) {
+ $this->uid = $result;
+ }
+ return !($result === false);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Set the password of the user
+ *
+ * @param string $password
+ * @param string $recoveryPassword for the encryption app to reset encryption keys
+ * @return bool
+ */
+ public function setPassword($password, $recoveryPassword) {
+ if ($this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD)) {
+ if ($this->emitter) {
+ $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
+ }
+ $result = $this->backend->setPassword($this->uid, $password);
+ if ($this->emitter) {
+ $this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
+ }
+ return !($result === false);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * get the users home folder to mount
+ *
+ * @return string
+ */
+ public function getHome() {
+ if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+ return $home;
+ }
+ return \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented
+ }
+
+ /**
+ * check if the backend supports changing passwords
+ *
+ * @return bool
+ */
+ public function canChangePassword() {
+ return $this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD);
+ }
+
+ /**
+ * check if the backend supports changing display names
+ *
+ * @return bool
+ */
+ public function canChangeDisplayName() {
+ return $this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME);
+ }
+
+ /**
+ * check if the user is enabled
+ *
+ * @return bool
+ */
+ public function isEnabled() {
+ return $this->enabled;
+ }
+
+ /**
+ * set the enabled status for the user
+ *
+ * @param bool $enabled
+ */
+ public function setEnabled($enabled) {
+ $this->enabled = $enabled;
+ $enabled = ($enabled) ? 'true' : 'false';
+ \OC_Preferences::setValue($this->uid, 'core', 'enabled', $enabled);
+ }
+}
diff --git a/lib/util.php b/lib/util.php
index f30cdf6a5346c93c52fbf0ec9ea5f1403cd82d44..95af22ed0eedfa9481ae2f63b7caa997ba32a307 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,4 +1,7 @@
<?php
+
+require_once 'Patchwork/PHP/Shim/Normalizer.php';
+
/**
* Class for utility functions
*
@@ -77,7 +80,7 @@ class OC_Util {
public static function getVersion() {
// hint: We only can count up. Reset minor/patchlevel when
// updating major/minor version number.
- return array(5, 80, 02);
+ return array(5, 80, 05);
}
/**
@@ -151,10 +154,10 @@ class OC_Util {
* @param bool dateOnly option to omit time from the result
*/
public static function formatDate( $timestamp, $dateOnly=false) {
- if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it
+ if(\OC::$session->exists('timezone')) {//adjust to clients timezone if we know it
$systemTimeZone = intval(date('O'));
$systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100);
- $clientTimeZone=$_SESSION['timezone']*60;
+ $clientTimeZone=\OC::$session->get('timezone')*60;
$offset=$clientTimeZone-$systemTimeZone;
$timestamp=$timestamp+$offset*60;
}
@@ -173,7 +176,8 @@ class OC_Util {
//check for database drivers
if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
and !is_callable('mysql_connect')
- and !is_callable('pg_connect')) {
+ and !is_callable('pg_connect')
+ and !is_callable('oci_connect')) {
$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
'hint'=>'');//TODO: sane hint
$web_server_restart= true;
@@ -457,13 +461,13 @@ class OC_Util {
*/
public static function callRegister() {
// Check if a token exists
- if(!isset($_SESSION['requesttoken'])) {
+ if(!\OC::$session->exists('requesttoken')) {
// No valid token found, generate a new one.
$requestToken = self::generate_random_bytes(20);
- $_SESSION['requesttoken']=$requestToken;
+ \OC::$session->set('requesttoken', $requestToken);
} else {
// Valid token already exists, send it
- $requestToken = $_SESSION['requesttoken'];
+ $requestToken = \OC::$session->get('requesttoken');
}
return($requestToken);
}
@@ -475,7 +479,7 @@ class OC_Util {
* @see OC_Util::callRegister()
*/
public static function isCallRegistered() {
- if(!isset($_SESSION['requesttoken'])) {
+ if(!\OC::$session->exists('requesttoken')) {
return false;
}
@@ -491,7 +495,7 @@ class OC_Util {
}
// Check if the token is valid
- if($token !== $_SESSION['requesttoken']) {
+ if($token !== \OC::$session->get('requesttoken')) {
// Not valid
return false;
} else {
@@ -640,11 +644,10 @@ class OC_Util {
/**
* Check if the ownCloud server can connect to the internet
*/
- public static function isinternetconnectionworking() {
-
- // in case there is no internet connection on purpose there is no need to display a warning
- if (!\OC_Config::getValue("has_internet_connection", true)) {
- return true;
+ public static function isInternetConnectionWorking() {
+ // in case there is no internet connection on purpose return false
+ if (self::isInternetConnectionEnabled() === false) {
+ return false;
}
// try to connect to owncloud.org to see if http connections to the internet are possible.
@@ -666,6 +669,13 @@ class OC_Util {
}
}
+
+ /**
+ * Check if the connection to the internet is disabled on purpose
+ */
+ public static function isInternetConnectionEnabled(){
+ return \OC_Config::getValue("has_internet_connection", true);
+ }
/**
* clear all levels of output buffering
@@ -822,5 +832,21 @@ class OC_Util {
return $theme;
}
+ /**
+ * Normalize a unicode string
+ * @param string $value a not normalized string
+ * @return bool|string
+ */
+ public static function normalizeUnicode($value) {
+ if(class_exists('Patchwork\PHP\Shim\Normalizer')) {
+ $normalizedValue = \Patchwork\PHP\Shim\Normalizer::normalize($value);
+ if($normalizedValue === false) {
+ \OC_Log::write( 'core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
+ } else {
+ $value = $normalizedValue;
+ }
+ }
+ return $value;
+ }
}
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 5975e688b75cad4ff9a5422c3052a3aedfc9a6b8..91c72d5dfaecda0cf31c007f8a411b45b8bf3ae7 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -324,6 +324,37 @@ class OC_VCategories {
return $id;
}
+ /**
+ * @brief Rename category.
+ * @param string $from The name of the existing category
+ * @param string $to The new name of the category.
+ * @returns bool
+ */
+ public function rename($from, $to) {
+ $id = $this->array_searchi($from, $this->categories);
+ if($id === false) {
+ OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG);
+ return false;
+ }
+
+ $sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? '
+ . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
+ try {
+ $stmt = OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($to, $this->user, $this->type, $id));
+ if (OC_DB::isError($result)) {
+ OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
+ return false;
+ }
+ } catch(Exception $e) {
+ OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ OCP\Util::ERROR);
+ return false;
+ }
+ $this->categories[$id] = $to;
+ return true;
+ }
+
/**
* @brief Add a new category.
* @param $names A string with a name or an array of strings containing
diff --git a/public.php b/public.php
index 759e8e91619276bc1f45e2f9913cd23654ea3e84..3d7fd378af402e0f739bd86eabf8a656ec43eec9 100644
--- a/public.php
+++ b/public.php
@@ -1,6 +1,7 @@
<?php
$RUNTIME_NOAPPS = true;
require_once 'lib/base.php';
+OC::checkMaintenanceMode();
if (!isset($_GET['service'])) {
header('HTTP/1.0 404 Not Found');
exit;
diff --git a/settings/admin.php b/settings/admin.php
index 035cef5bf95f8f809d81563c6251ec7a1edcdaf3..db041ef889c08e527fd9bdffc0b514e37b50c0ed 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -24,7 +24,7 @@ $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
+$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 4f16bff63d5283dd73858f2df1c83763f85321fa..cb66c57c743bcb9fc4fcb9bfb5bbff50a0b9753d 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,8 +8,9 @@ OC_JSON::checkLoggedIn();
OC_APP::loadApps();
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = isset($_POST["newpassword"]) ? $_POST["newpassword"] : null;
+$password = isset($_POST["password"]) ? $_POST["password"] : null;
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
+$recoveryPassword=isset($_POST["recoveryPassword"])?$_POST["recoveryPassword"]:null;
$userstatus = null;
if(OC_User::isAdminUser(OC_User::getUser())) {
@@ -27,8 +28,15 @@ if(is_null($userstatus)) {
exit();
}
-// Return Success story
-if(!is_null($password) && OC_User::setPassword( $username, $password )) {
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') {
+ OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" )));
+}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
+ OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
+}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
else{
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 46a0bbe7c3219ca1cce12b0f9bcab5d2fa06728b..950e892901208a799fe42702d4897212cca4aa3b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -45,6 +45,8 @@ table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; }
div.quota { float:right; display:block; position:absolute; right:25em; top:-1px; }
div.quota-select-wrapper { position: relative; }
+div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
+input#recoveryPassword {width:15em;}
select.quota { position:absolute; left:0; top:0; width:10em; }
select.quota-user { position:relative; left:0; top:0; width:10em; }
div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
diff --git a/settings/img/admin.png b/settings/img/admin.png
index d883f0b61a329a011a151ef382a0f3284bde9d15..8023d8de85041ac680bcdc20c889c13f084973e6 100644
Binary files a/settings/img/admin.png and b/settings/img/admin.png differ
diff --git a/settings/img/admin.svg b/settings/img/admin.svg
index 1ea226231b3a36616f472a7b9d08453112a93e86..90d87272017e929ce3ca1b2a51bb5492d6dded84 100644
--- a/settings/img/admin.svg
+++ b/settings/img/admin.svg
@@ -1,2128 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="admin.svg"
- inkscape:export-filename="admin.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="16.000001"
- inkscape:cx="0.93200388"
- inkscape:cy="4.680543"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4566-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- id="linearGradient3587-6-5-26">
- <stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- id="linearGradient4580-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6-3" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-2-1">
- <stop
- id="stop3589-9-2-8-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="1013.451"
- x2="209.34245"
- y1="998.45801"
- x1="209.34245"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3528"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- id="linearGradient3335-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-4">
- <stop
- id="stop3589-9-2-8-7-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-6"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-8-3">
- <stop
- id="stop3589-9-2-67-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3584">
- <stop
- id="stop3586"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3588"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3591">
- <stop
- id="stop3593"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3595"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3598">
- <stop
- id="stop3600"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3602"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-8-3-9">
- <stop
- id="stop3589-9-2-67-4-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-9-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4682">
- <stop
- id="stop4684"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4686"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4689">
- <stop
- id="stop4691"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4693"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- id="linearGradient4665-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4696">
- <stop
- id="stop4698"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4700"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4823"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4825"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4827"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4829"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1-5"
- xlink:href="#linearGradient3587-6-5-86-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86-0">
- <stop
- id="stop3589-9-2-65-9"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427-9"
- xlink:href="#linearGradient3587-6-5-86-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3630">
- <stop
- id="stop3632"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3634"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436-6"
- xlink:href="#linearGradient3587-6-5-86-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3637">
- <stop
- id="stop3639"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3641"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442-8"
- xlink:href="#linearGradient3587-6-5-86-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3644">
- <stop
- id="stop3646"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3648"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-86-0"
- id="linearGradient4919"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)"
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-86-0-6"
- id="linearGradient4911-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)"
- x1="11"
- y1="6"
- x2="11"
- y2="17" />
- <linearGradient
- id="linearGradient3587-6-5-86-0-6">
- <stop
- id="stop3589-9-2-65-9-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17"
- x2="11"
- y1="6"
- x1="11"
- gradientTransform="matrix(0.15503877,0,0,0.11235953,3.7984496,11.52809)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4936"
- xlink:href="#linearGradient3587-6-5-86-0-6"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-86-0-9">
- <stop
- id="stop3589-9-2-65-9-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient5080">
- <stop
- id="stop5082"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop5084"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient5087">
- <stop
- id="stop5089"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop5091"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-86-0-9"
- id="linearGradient4907-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)"
- x1="11"
- y1="6"
- x2="11"
- y2="17" />
- <linearGradient
- id="linearGradient5094">
- <stop
- id="stop5096"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop5098"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- id="path7671"
- d="M 2,2 2,5 5,5 5,2 2,2 z M 6,3 6,4 14,4 14,3 6,3 z M 2,6 2,9 5,9 5,6 2,6 z m 4,1 0,1 8,0 0,-1 -8,0 z m -4,3 0,3 3,0 0,-3 -3,0 z m 1,1 1,0 0,1 -1,0 0,-1 z m 3,0 0,1 8,0 0,-1 -8,0 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- inkscape:connector-curvature="0" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 2 3 L 2 6 L 5 6 L 5 3 L 2 3 z M 6 4 L 6 5 L 14 5 L 14 4 L 6 4 z M 2 7 L 2 10 L 5 10 L 5 7 L 2 7 z M 6 8 L 6 9 L 14 9 L 14 8 L 6 8 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z M 6 12 L 6 13 L 14 13 L 14 12 L 6 12 z "
- id="path2407-9" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 2v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm1 1h1v1h-1v-1zm3 0v1h8v-1h-8z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm1 1h1v1h-1v-1zm3 0v1h8v-1h-8z" fill="#fff"/>
+ </g>
</svg>
diff --git a/settings/img/apps.png b/settings/img/apps.png
index de5ccbd2c5fc6276a7ea359fd8b708b85baff6df..2b18f678a0295f45a82250698440a9b6d9e1ed43 100644
Binary files a/settings/img/apps.png and b/settings/img/apps.png differ
diff --git a/settings/img/apps.svg b/settings/img/apps.svg
index d3415921209e96e9b275d593b17d1c68d12d14c3..e2cc48f295697fc61dfdd1349be43714b981345c 100644
--- a/settings/img/apps.svg
+++ b/settings/img/apps.svg
@@ -1,2113 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="apps.svg"
- inkscape:export-filename="apps.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="16.000001"
- inkscape:cx="-11.700054"
- inkscape:cy="5.0070539"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-26"
- id="linearGradient4566-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- id="linearGradient3587-6-5-26">
- <stop
- id="stop3589-9-2-45"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-20"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- id="linearGradient4580-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6-3" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-2-1">
- <stop
- id="stop3589-9-2-8-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="1013.451"
- x2="209.34245"
- y1="998.45801"
- x1="209.34245"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3528"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- id="linearGradient3335-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-4">
- <stop
- id="stop3589-9-2-8-7-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-6"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3567"
- xlink:href="#linearGradient3587-6-5-2-4-4"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5021-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-3">
- <stop
- id="stop3589-9-2-67-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5018-2"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3584">
- <stop
- id="stop3586"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3588"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5015-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3591">
- <stop
- id="stop3593"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3595"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient5012-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3598">
- <stop
- id="stop3600"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3602"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4638"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4640"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4642"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4644"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4656"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4659"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4661"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4663"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4665"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-3-9">
- <stop
- id="stop3589-9-2-67-4-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-9-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- id="linearGradient4661-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4682">
- <stop
- id="stop4684"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4686"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4689">
- <stop
- id="stop4691"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4693"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- id="linearGradient4665-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4696">
- <stop
- id="stop4698"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4700"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="19.490837"
- x2="26.045763"
- y1="9.6223383"
- x1="26.045763"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4707"
- xlink:href="#linearGradient3587-6-5-8-3-9"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4823"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4825"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4827"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-3"
- id="linearGradient4829"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- id="path7131"
- d="M 2,2 2,2.5 2,5.5 2,6 2.5,6 5.5,6 6,6 6,5.5 6,2.5 6,2 5.5,2 2.5,2 2,2 z m 8,0 0,0.5 0,3 0,0.5 0.5,0 3,0 0.5,0 0,-0.5 0,-3 0,-0.5 -0.5,0 -3,0 -0.5,0 z m -8,7 0,0.5 0,3 0,0.5 0.5,0 3,0 L 6,13 6,12.5 6,9.5 6,9 5.5,9 2.5,9 2,9 z m 8,0 0,0.5 0,3 0,0.5 0.5,0 3,0 0.5,0 0,-0.5 0,-3 0,-0.5 -0.5,0 -3,0 -0.5,0 z m 1,1 2,0 0,2 -2,0 0,-2 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- inkscape:connector-curvature="0" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="M 2 3 L 2 3.5 L 2 6.5 L 2 7 L 2.5 7 L 5.5 7 L 6 7 L 6 6.5 L 6 3.5 L 6 3 L 5.5 3 L 2.5 3 L 2 3 z M 10 3 L 10 3.5 L 10 6.5 L 10 7 L 10.5 7 L 13.5 7 L 14 7 L 14 6.5 L 14 3.5 L 14 3 L 13.5 3 L 10.5 3 L 10 3 z M 2 10 L 2 10.5 L 2 13.5 L 2 14 L 2.5 14 L 5.5 14 L 6 14 L 6 13.5 L 6 10.5 L 6 10 L 5.5 10 L 2.5 10 L 2 10 z M 10 10 L 10 10.5 L 10 13.5 L 10 14 L 10.5 14 L 13.5 14 L 14 14 L 14 13.5 L 14 10.5 L 14 10 L 13.5 10 L 10.5 10 L 10 10 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z "
- id="rect3187" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 2v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 3v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z" fill="#fff"/>
+ </g>
</svg>
diff --git a/settings/img/help.png b/settings/img/help.png
index c0200096735bb7394db96e70170a18b3dbf3b127..00d9761ee363fdfdf979280edf980b504b3e6d1b 100644
Binary files a/settings/img/help.png and b/settings/img/help.png differ
diff --git a/settings/img/help.svg b/settings/img/help.svg
index 55b68e6baf29bbbf579bbca3be493c3064c251ef..f393ab5b1fd69ca776a730e31ffb0fb0edabbc6f 100644
--- a/settings/img/help.svg
+++ b/settings/img/help.svg
@@ -1,1744 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="help.svg"
- inkscape:export-filename="help.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="6.55629"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="20.074369"
- x2="14.152531"
- y1="-1.4095211"
- x1="14.501121"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3437"
- xlink:href="#linearGradient3587-6-5-19"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-4"
- id="linearGradient4357-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- id="linearGradient3587-6-5-4">
- <stop
- id="stop3589-9-2-1"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-04"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- d="M 5,7.4745455 C 5.1553559,7.8555569 5.3254225,8.1626049 5.6445055,7.7203686 6.0511155,7.4518883 7.4032866,6.2925134 7.306182,7.3783314 6.9380321,9.3952173 6.4719842,11.395026 6.1350434,13.416813 5.7433935,14.532242 6.7700459,15.485145 7.7729966,14.729405 8.8508925,14.226276 9.7645378,13.440939 10.701,12.716521 10.556654,12.394581 10.45052,11.928009 10.104148,12.370754 9.6358672,12.60987 8.6349897,13.688222 8.4078086,12.841549 8.7231912,10.661003 9.3833675,8.5467083 9.7732743,6.3804237 10.171027,5.3755033 9.4087907,4.1570843 8.3735125,5.0170344 7.1169594,5.6343496 6.0839075,6.6013769 5,7.4745455 z M 9.4594228,0.00267693 C 8.1518785,-0.01465888 7.5537936,2.148248 8.8167256,2.6822129 9.8391583,3.0601798 10.893193,1.968369 10.606228,0.93179353 10.508499,0.38994073 10.008923,-0.0379875 9.4594238,0.00267693 l -10e-7,0 z"
- id="path6558"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
- id="path3536"
- d="M 5,8.4745452 C 5.1553559,8.8555566 5.3254225,9.1626046 5.6445055,8.7203683 6.0511155,8.451888 7.4032866,7.2925131 7.306182,8.3783311 6.9380321,10.395217 6.4719842,12.395026 6.1350434,14.416813 5.7433935,15.532242 6.7700459,16.485145 7.7729966,15.729405 8.8508925,15.226276 9.7645378,14.440939 10.701,13.716521 10.556654,13.394581 10.45052,12.928009 10.104148,13.370754 9.6358672,13.60987 8.6349897,14.688222 8.4078086,13.841549 8.7231912,11.661003 9.3833675,9.546708 9.7732743,7.3804234 10.171027,6.375503 9.4087907,5.157084 8.3735125,6.0170341 7.1169594,6.6343493 6.0839075,7.6013766 5,8.4745452 z M 9.4594228,1.0026766 C 8.1518785,0.98534079 7.5537936,3.1482477 8.8167256,3.6822126 9.8391583,4.0601795 10.893193,2.9683687 10.606228,1.9317932 10.508499,1.3899404 10.008923,0.96201217 9.4594238,1.0026766 l -10e-7,0 z" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+ <path d="m5 7.4745c0.1554 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7588-1.4279 1.6617-0.3421-0.3682 2.0169-0.8342 4.0167-1.1712 6.0387-0.3916 1.115 0.635 2.068 1.638 1.312 1.0779-0.503 1.9915-1.288 2.928-2.012-0.144-0.322-0.25-0.789-0.597-0.346-0.4681 0.239-1.469 1.317-1.6962 0.471 0.3154-2.181 0.9756-4.2953 1.3655-6.4616 0.3977-1.0049-0.3645-2.2233-1.3998-1.3634-1.2565 0.6173-2.2896 1.5844-3.3735 2.4575zm4.4594-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0225 0.378 2.0763-0.7138 1.7893-1.7504-0.098-0.54186-0.597-0.96979-1.1466-0.92912h-0.000001z"/>
+ <path d="m5 8.4745c0.1554 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7588-1.4279 1.6617-0.3421-0.3682 2.0167-0.8342 4.0167-1.1712 6.0387-0.3916 1.115 0.635 2.068 1.638 1.312 1.0779-0.503 1.9915-1.288 2.928-2.012-0.144-0.322-0.25-0.789-0.597-0.346-0.4681 0.239-1.469 1.317-1.6962 0.471 0.3154-2.181 0.9756-4.2953 1.3655-6.4616 0.3977-1.0049-0.3645-2.2233-1.3998-1.3634-1.2565 0.6173-2.2896 1.5844-3.3735 2.4575zm4.4594-7.4718c-1.3075-0.01736-1.9056 2.1455-0.6427 2.6795 1.0225 0.378 2.0763-0.7138 1.7893-1.7504-0.098-0.5419-0.597-0.96979-1.1466-0.9291h-0.000001z" fill="#fff"/>
+ </g>
</svg>
diff --git a/settings/img/log.svg b/settings/img/log.svg
index 72d4758acebf3ddac75dbd3db512fd4d6f0b58fa..a3939b730934866b75cb11723460fd2f56831cc1 100644
--- a/settings/img/log.svg
+++ b/settings/img/log.svg
@@ -1,86 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="16px"
- height="16px"
- viewBox="0 0 100 100"
- enable-background="new 0 0 100 100"
- xml:space="preserve"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="log.svg"><metadata
- id="metadata21"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs19" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1680"
- inkscape:window-height="1004"
- id="namedview17"
- showgrid="false"
- inkscape:zoom="3.06"
- inkscape:cx="50"
- inkscape:cy="50"
- inkscape:window-x="-2"
- inkscape:window-y="23"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" />
-<rect
- x="75"
- y="45"
- width="4"
- height="19"
- id="rect3"
- style="fill:#4d4d4d" />
-<polygon
- points="21,0 21,19 25,19 25,4 75,4 75,19 79,19 79,0 "
- id="polygon5"
- style="fill:#4d4d4d" />
-<polygon
- points="75,45 75,96 44,96 44,77 25,77 25,45 21,45 21,80 41,100 79,100 79,45 "
- id="polygon7"
- style="fill:#4d4d4d" />
-<rect
- x="31"
- y="45"
- width="38"
- height="3"
- id="rect9"
- style="fill:#4d4d4d" />
-<rect
- x="31"
- y="56"
- width="38"
- height="3"
- id="rect11"
- style="fill:#4d4d4d" />
-<rect
- x="31"
- y="67"
- width="38"
- height="3"
- id="rect13"
- style="fill:#4d4d4d" />
-<path
- d="M0,21v48h19V59h-9V31h80v28h-9v10h19V21H0z M97,28h-4v-4h4V28z"
- id="path15"
- style="fill:#4d4d4d" />
-</svg>
\ No newline at end of file
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 100 100" xml:space="preserve" height="16px" viewBox="0 0 100 100" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><g fill="#4d4d4d">
+<rect height="19" width="4" y="45" x="75"/>
+<polygon points="21 0 21 19 25 19 25 4 75 4 75 19 79 19 79 0"/>
+<polygon points="75 45 75 96 44 96 44 77 25 77 25 45 21 45 21 80 41 100 79 100 79 45"/>
+<rect height="3" width="38" y="45" x="31"/>
+<rect height="3" width="38" y="56" x="31"/>
+<rect height="3" width="38" y="67" x="31"/>
+<path d="m0 21v48h19v-10h-9v-28h80v28h-9v10h19v-48h-100zm97 7h-4v-4h4v4z"/>
+</g></svg>
diff --git a/settings/img/personal.svg b/settings/img/personal.svg
index 2f3a77d07a22bc11f21516362dd6c144f26db58e..c0213f8589b6e850e9a14f8356c63dcb6b5801bd 100644
--- a/settings/img/personal.svg
+++ b/settings/img/personal.svg
@@ -1,1714 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="personal.svg"
- inkscape:export-filename="personal.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="6.55629"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="47.208389"
- x2="-39.421574"
- y1="-5.2547116"
- x1="-39.421574"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3397"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3417"
- xlink:href="#linearGradient3587-6-5-10"
- inkscape:collect="always" />
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- sodipodi:nodetypes="sccccsscscsscccccccsccscscsscccss"
- inkscape:connector-curvature="0"
- d="M 8.0037806,-1.6024174e-5 C 6.3807201,-1.6024174e-5 5.0038159,1.186928 5.0038159,2.718703 c 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 C 5.9313479,8.119786 5.0636516,8.411419 4.2850726,8.749892 3.84796,8.93992 3.4524206,9.10961 3.1288352,9.312386 2.8052509,9.515163 2.4834413,9.668364 2.3788448,10.124877 c -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499327,1.062488 2.1647184,-0.0084 4.3189754,-0.333832 5.6874324,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.3124721,-0.937489 -0.045118,-0.100507 -0.089936,-0.392929 0,-0.84374 C 9.4341669,6.878873 9.4719829,6.749222 9.5037669,6.624928 9.5795229,6.540078 9.63857,6.47074 9.7225145,6.374931 9.9015494,6.170591 10.093923,5.956233 10.253757,5.749939 10.413593,5.543644 10.544361,5.366667 10.628753,5.124945 L 10.66,5.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 C 11.003747,1.186948 9.6268455,3.9858261e-6 8.0037819,3.9858261e-6 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- id="path6033" />
- <path
- id="path2880-5-3"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 8.0037806,0.99998399 c -1.6230605,0 -2.9999647,1.18694401 -2.9999647,2.71871901 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 C 5.9313479,9.119786 5.0636516,9.411419 4.2850726,9.749892 3.84796,9.93992 3.4524206,10.10961 3.1288352,10.312386 c -0.3235843,0.202777 -0.6453939,0.355978 -0.7499904,0.812491 -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499327,1.062488 2.1647184,-0.0084 4.3189754,-0.333832 5.6874324,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.3124721,-0.937489 -0.045118,-0.100507 -0.089936,-0.392929 0,-0.84374 C 9.4341669,7.878873 9.4719829,7.749222 9.5037669,7.624928 9.5795229,7.540078 9.63857,7.47074 9.7225145,7.374931 9.9015494,7.170591 10.093923,6.956233 10.253757,6.749939 10.413593,6.543644 10.544361,6.366667 10.628753,6.124945 L 10.66,6.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 c 0,-1.531774 -1.3769015,-2.718718 -2.9999651,-2.718718 z"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sccccsscscsscccccccsccscscsscccss" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0038-0.000016024c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3597-1.1563 0.5625-0.3235 0.2028-0.6454 0.356-0.75 0.8126-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.045118-0.10051-0.089936-0.39293 0-0.84374 0.0246-0.1213 0.0624-0.251 0.0942-0.3753 0.0757-0.0848 0.1348-0.1542 0.2187-0.25 0.179-0.2043 0.3715-0.4187 0.5315-0.625s0.29-0.3832 0.375-0.625l0.031-0.0312c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5319-1.3772-2.7188-3.0002-2.7188z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0038 0.99998c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3601-1.1563 0.5621-0.32358 0.20278-0.64539 0.35598-0.74999 0.81249-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.045118-0.10051-0.089936-0.39293 0-0.84374 0.0246-0.1208 0.0624-0.2505 0.0942-0.3748 0.0757-0.0848 0.1348-0.1542 0.2187-0.25 0.179-0.2043 0.3715-0.4187 0.5315-0.625s0.29-0.3832 0.375-0.625l0.031-0.0312c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5318-1.3769-2.7187-3-2.7187z" fill="#fff"/>
+ </g>
</svg>
diff --git a/settings/img/users.png b/settings/img/users.png
index a811af47c1c25837f54996a0edfd645290b5233c..e819b5f320515a3eb664f1ee2b571ab0b6e11a45 100644
Binary files a/settings/img/users.png and b/settings/img/users.png differ
diff --git a/settings/img/users.svg b/settings/img/users.svg
index 5ef31b763bb8d3d96e99ac5e01f231bfdc5a8d33..9008e1d211f16e971ea00237dd518ad005842f7f 100644
--- a/settings/img/users.svg
+++ b/settings/img/users.svg
@@ -1,1723 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="16"
- height="16"
- id="svg11300"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="users.svg"
- inkscape:export-filename="users.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata26">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#cccccc"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="745"
- id="namedview24"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:zoom="22.627418"
- inkscape:cx="6.55629"
- inkscape:cy="9.2202448"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4146">
- <inkscape:grid
- type="xygrid"
- id="grid4330"
- empspacing="5"
- dotted="true"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient4136">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140" />
- </linearGradient>
- <linearGradient
- id="linearGradient4303">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop4305" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4307" />
- </linearGradient>
- <linearGradient
- id="linearGradient4297">
- <stop
- id="stop4299"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4301"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4115">
- <stop
- id="stop4117"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3785">
- <stop
- id="stop3787"
- style="stop-color:#b8b8b8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3789"
- style="stop-color:#878787;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient6954">
- <stop
- id="stop6960"
- style="stop-color:#f5f5f5;stop-opacity:1"
- offset="0" />
- <stop
- id="stop6962"
- style="stop-color:#d2d2d2;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3341">
- <stop
- id="stop3343"
- style="stop-color:white;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3345"
- style="stop-color:white;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="24.999998"
- cy="28.659998"
- r="16"
- fx="24.999998"
- fy="28.659998"
- id="radialGradient2856"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
- <linearGradient
- x1="30"
- y1="25.084745"
- x2="30"
- y2="45"
- id="linearGradient2858"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <radialGradient
- cx="26.375898"
- cy="12.31301"
- r="8"
- fx="26.375898"
- fy="12.31301"
- id="radialGradient2860"
- xlink:href="#linearGradient6954"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
- <linearGradient
- x1="30"
- y1="5"
- x2="30"
- y2="44.678879"
- id="linearGradient2862"
- xlink:href="#linearGradient3785"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="30"
- y1="0.91818392"
- x2="30"
- y2="25.792814"
- id="linearGradient2864"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
- <linearGradient
- x1="29.955881"
- y1="21.86607"
- x2="29.955881"
- y2="43.144382"
- id="linearGradient2866"
- xlink:href="#linearGradient3341"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient7308"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
- x1="34.992828"
- y1="0.94087797"
- x2="34.992828"
- y2="33.955856" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3796"
- x1="8.3635759"
- y1="15.028702"
- x2="15.937561"
- y2="11.00073"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3798"
- x1="6.9951797"
- y1="4.7478018"
- x2="13.00482"
- y2="4.7478018"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3815"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3815-3"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-0" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
- id="linearGradient3831"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3833">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3835" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3837" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3874"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- id="linearGradient3892-2"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient3984"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3909-3"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-7" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4115-9"
- id="linearGradient4113-3"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4115-9">
- <stop
- id="stop4117-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4119-6"
- style="stop-color:#363636;stop-opacity:0.698"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3104"
- id="linearGradient3815-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
- x1="-51.786404"
- y1="50.786446"
- x2="-51.786404"
- y2="2.9062471" />
- <linearGradient
- id="linearGradient3104">
- <stop
- id="stop3106"
- style="stop-color:#aaaaaa;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3108"
- style="stop-color:#c8c8c8;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <radialGradient
- cx="13.138569"
- cy="25.625349"
- r="13.931416"
- fx="13.138569"
- fy="25.625349"
- id="radialGradient2965"
- xlink:href="#linearGradient3690-451"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
- <linearGradient
- id="linearGradient3690-451">
- <stop
- id="stop2857"
- style="stop-color:#e8e8e8;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2859"
- style="stop-color:#d8d8d8;stop-opacity:1"
- offset="0.26238" />
- <stop
- id="stop2861"
- style="stop-color:#c2c2c2;stop-opacity:1"
- offset="0.66093999" />
- <stop
- id="stop2863"
- style="stop-color:#a5a5a5;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="21.483376"
- y1="36.255058"
- x2="21.483376"
- y2="9.5799999"
- id="linearGradient2967"
- xlink:href="#linearGradient3603-84"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
- <linearGradient
- id="linearGradient3603-84">
- <stop
- id="stop2867"
- style="stop-color:#707070;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2869"
- style="stop-color:#9e9e9e;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11.566265"
- y1="22.292103"
- x2="15.214532"
- y2="33.95525"
- id="linearGradient3674-262"
- xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
- <linearGradient
- id="linearGradient8265-821-176-38-919-66-249-529">
- <stop
- id="stop2873"
- style="stop-color:#ffffff;stop-opacity:0.27450982"
- offset="0" />
- <stop
- id="stop2875"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="24.046366"
- y1="11.673002"
- x2="24.046366"
- y2="34.713669"
- id="linearGradient3677-116"
- xlink:href="#linearGradient3642-81"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
- <linearGradient
- id="linearGradient3642-81">
- <stop
- id="stop2879"
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0" />
- <stop
- id="stop2881"
- style="stop-color:#ffffff;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="34.713669"
- x2="24.046366"
- y1="11.673002"
- x1="24.046366"
- gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3037"
- xlink:href="#linearGradient3642-81"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3155-40"
- id="linearGradient8639"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
- spreadMethod="pad"
- x1="23.575972"
- y1="25.356892"
- x2="23.575972"
- y2="31.210939" />
- <linearGradient
- id="linearGradient3155-40">
- <stop
- id="stop2541"
- offset="0"
- style="stop-color:#181818;stop-opacity:1;" />
- <stop
- style="stop-color:#dbdbdb;stop-opacity:1;"
- offset="0.13482948"
- id="stop2543" />
- <stop
- id="stop2545"
- offset="0.20224422"
- style="stop-color:#a4a4a4;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.26965895"
- id="stop2547" />
- <stop
- id="stop2549"
- offset="0.44650277"
- style="stop-color:#8d8d8d;stop-opacity:1;" />
- <stop
- style="stop-color:#959595;stop-opacity:1;"
- offset="0.57114136"
- id="stop2551" />
- <stop
- id="stop2553"
- offset="0.72038066"
- style="stop-color:#cecece;stop-opacity:1;" />
- <stop
- id="stop2555"
- offset="1"
- style="stop-color:#181818;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-279"
- id="linearGradient8641"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-279">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2559" />
- <stop
- id="stop2561"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2563" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-789"
- id="linearGradient8643"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-789">
- <stop
- id="stop2567"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2569" />
- <stop
- id="stop2571"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-686"
- id="linearGradient8645"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-686">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2575" />
- <stop
- id="stop2577"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2579" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-768"
- id="linearGradient8647"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-768">
- <stop
- id="stop2583"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2585" />
- <stop
- id="stop2587"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3240-907"
- id="linearGradient8649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3240-907">
- <stop
- style="stop-color:#565656;stop-opacity:1;"
- offset="0"
- id="stop2591" />
- <stop
- id="stop2593"
- offset="0.5"
- style="stop-color:#9a9a9a;stop-opacity:1;" />
- <stop
- style="stop-color:#545454;stop-opacity:1;"
- offset="1"
- id="stop2595" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3223-699"
- id="linearGradient8651"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
- x1="30.037716"
- y1="24.989594"
- x2="30.037716"
- y2="30.000141" />
- <linearGradient
- id="linearGradient3223-699">
- <stop
- id="stop2599"
- offset="0"
- style="stop-color:#b1b1b1;stop-opacity:1;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0.5"
- id="stop2601" />
- <stop
- id="stop2603"
- offset="1"
- style="stop-color:#8f8f8f;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3290-678"
- id="linearGradient8653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
- x1="9"
- y1="29.056757"
- x2="9"
- y2="26.02973" />
- <linearGradient
- id="linearGradient3290-678">
- <stop
- id="stop2607"
- offset="0"
- style="stop-color:#ece5a5;stop-opacity:1;" />
- <stop
- id="stop2609"
- offset="1"
- style="stop-color:#fcfbf2;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3191-577"
- id="linearGradient8655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
- x1="5.5178981"
- y1="37.371799"
- x2="9.5220556"
- y2="41.391716" />
- <linearGradient
- id="linearGradient3191-577">
- <stop
- id="stop2613"
- offset="0"
- style="stop-color:#dbce48;stop-opacity:1;" />
- <stop
- id="stop2615"
- offset="1"
- style="stop-color:#c5b625;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
- id="linearGradient3934-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4154-8"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4326"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4328"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093"
- id="linearGradient3878"
- xlink:href="#linearGradient3587-6-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,-3.4266134)" />
- <linearGradient
- id="linearGradient3587-6-5">
- <stop
- id="stop3589-9-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4357"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
- x1="0.86849999"
- y1="13.895414"
- x2="0.44923753"
- y2="28.776533" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
- id="linearGradient4405"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4413-7"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-3-4-5-4-0-1-55">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-3-2-53-4-3-95" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-7-9-86-9-3-6" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4411-3"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- id="linearGradient3587-6-5-2">
- <stop
- id="stop3589-9-2-8"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient4466-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4">
- <stop
- id="stop3589-9-2-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="54.703121"
- x2="-41.553459"
- y1="2.2401412"
- x1="-41.553459"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4483-3"
- xlink:href="#linearGradient3587-6-5-2-4-9"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-9">
- <stop
- id="stop3589-9-2-8-7-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-8"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4564"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5"
- id="linearGradient4566"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(13.927091,16.573387)"
- x1="-2.4040222"
- y1="4.4573336"
- x2="-2.4040222"
- y2="18.967093" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2"
- id="linearGradient4578"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
- id="linearGradient4580"
- gradientUnits="userSpaceOnUse"
- x1="209.34245"
- y1="998.45801"
- x2="209.34245"
- y2="1013.451" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4359-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-3">
- <stop
- id="stop3589-9-2-6"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3"
- id="linearGradient4361-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient4597">
- <stop
- id="stop4599"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4601"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4610"
- xlink:href="#linearGradient3587-6-5-3"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422"
- xlink:href="#linearGradient3587-6-5-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-5">
- <stop
- id="stop3589-9-2-4"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3189"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
- <linearGradient
- id="linearGradient3587-6-5-8">
- <stop
- id="stop3589-9-2-67"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3203"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
- <linearGradient
- id="linearGradient3120">
- <stop
- id="stop3122"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3124"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3207"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
- <linearGradient
- id="linearGradient3127">
- <stop
- id="stop3129"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3131"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837"
- id="linearGradient3211"
- xlink:href="#linearGradient3587-6-5-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
- <linearGradient
- id="linearGradient3134">
- <stop
- id="stop3136"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3138"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2409"
- xlink:href="#linearGradient3587-6-5-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
- <linearGradient
- id="linearGradient3587-6-5-1">
- <stop
- id="stop3589-9-2-0"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-21"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="40.805084"
- y1="5.6271191"
- x2="40.805084"
- y2="17.627119"
- id="linearGradient3206"
- xlink:href="#linearGradient3587-8-5"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-32.805085,-3.6271193)" />
- <linearGradient
- id="linearGradient3587-8-5">
- <stop
- id="stop3589-2-7"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-3-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="17.627119"
- x2="40.805084"
- y1="5.6271191"
- x1="40.805084"
- gradientTransform="translate(-32.805085,-3.6271193)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3180"
- xlink:href="#linearGradient3587-8-5"
- inkscape:collect="always" />
- <linearGradient
- x1="1.3333321"
- y1="6.6666665"
- x2="1.3333321"
- y2="33.333332"
- id="linearGradient2422-1"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
- <linearGradient
- id="linearGradient3587-6-5-86">
- <stop
- id="stop3589-9-2-65"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2427"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
- <linearGradient
- id="linearGradient3207-3">
- <stop
- id="stop3209"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3211"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2436"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
- <linearGradient
- id="linearGradient3214">
- <stop
- id="stop3216"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3218"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="11"
- y1="6"
- x2="11"
- y2="17"
- id="linearGradient2442"
- xlink:href="#linearGradient3587-6-5-86"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
- <linearGradient
- id="linearGradient3221">
- <stop
- id="stop3223"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3225"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="1.3333321"
- y1="4.9755898"
- x2="1.3333321"
- y2="37.373981"
- id="linearGradient2422-1-0"
- xlink:href="#linearGradient3587-6-5-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
- <linearGradient
- id="linearGradient3587-6-5-0">
- <stop
- id="stop3589-9-2-5"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- x1="46.395508"
- y1="12.707516"
- x2="46.395508"
- y2="38.409042"
- id="linearGradient3795-2"
- xlink:href="#linearGradient3587-6-5-3-5-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
- <linearGradient
- id="linearGradient3587-6-5-3-5-7">
- <stop
- id="stop3589-9-2-2-6-2"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-73-5-1"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3587-6-5-3-5">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1"
- id="stop3589-9-2-2-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop3591-7-4-73-5" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-3-5"
- id="linearGradient4872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
- x1="100.77747"
- y1="17.859186"
- x2="100.77747"
- y2="38.055252" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4894"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4900"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient4912"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient3587-6-5-8-6">
- <stop
- id="stop3589-9-2-67-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-2-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4935">
- <stop
- id="stop4937"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4939"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4942">
- <stop
- id="stop4944"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4946"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8-6"
- id="linearGradient4912-4"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- id="linearGradient4949">
- <stop
- id="stop4951"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop4953"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5012"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5015"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-8"
- id="linearGradient5021"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
- x1="26.045763"
- y1="9.6223383"
- x2="26.045763"
- y2="19.490837" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4"
- id="linearGradient3335"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4134"
- x1="9"
- y1="0"
- x2="9"
- y2="15"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136"
- id="linearGradient4150"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6"
- id="linearGradient3335-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6">
- <stop
- id="stop3589-9-2-8-7-8"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-0"
- id="linearGradient3335-7-8"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-0">
- <stop
- id="stop3589-9-2-8-7-8-7"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-7"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-4"
- id="linearGradient3335-7-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.553459"
- y2="54.703121" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-4">
- <stop
- id="stop3589-9-2-8-7-8-2"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-2"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-7"
- id="linearGradient3335-7-3"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
- x1="-41.553459"
- y1="2.2401412"
- x2="-41.755585"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-7">
- <stop
- id="stop3589-9-2-8-7-8-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-5"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2"
- id="linearGradient3335-7-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2">
- <stop
- id="stop3589-9-2-8-7-8-77"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4136-9"
- id="linearGradient4150-0"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="9"
- y1="0"
- x2="9"
- y2="15" />
- <linearGradient
- id="linearGradient4136-9">
- <stop
- offset="0"
- style="stop-color:#000000;stop-opacity:1;"
- id="stop4138-6" />
- <stop
- offset="1"
- style="stop-color:#363636;stop-opacity:1"
- id="stop4140-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
- id="linearGradient3335-7-1-7"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
- x1="-39.421574"
- y1="-5.2547116"
- x2="-39.421574"
- y2="47.208389" />
- <linearGradient
- id="linearGradient3587-6-5-2-4-6-2-6">
- <stop
- id="stop3589-9-2-8-7-8-77-4"
- style="stop-color:#000000;stop-opacity:1;"
- offset="0" />
- <stop
- id="stop3591-7-4-0-3-4-9-3"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-10"
- id="linearGradient4328-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- x1="8.7094374"
- y1="1.0035814"
- x2="8.6826077"
- y2="16.052532" />
- <linearGradient
- id="linearGradient3587-6-5-10">
- <stop
- id="stop3589-9-2-3"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-4"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- <linearGradient
- y2="16.052532"
- x2="8.6826077"
- y1="1.0035814"
- x1="8.7094374"
- gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3417"
- xlink:href="#linearGradient3587-6-5-10"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3587-6-5-19"
- id="linearGradient4326-9"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
- x1="14.501121"
- y1="-1.4095211"
- x2="14.152531"
- y2="20.074369" />
- <linearGradient
- id="linearGradient3587-6-5-19">
- <stop
- id="stop3589-9-2-62"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop3591-7-4-54"
- style="stop-color:#363636;stop-opacity:1"
- offset="1" />
- </linearGradient>
- </defs>
- <g
- transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
- id="g3743-3"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <rect
- style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect3136"
- width="163.31035"
- height="97.986206"
- x="-62.896553"
- y="-32.993103" />
- <g
- transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
- id="g3743-9-4"
- style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
- <g
- id="g4146">
- <path
- d="m 4.1179357,1.711205 c -1.1132415,0 -2.0576469,0.814147 -2.0576469,1.86482 0.0079,0.332088 0.037602,0.741596 0.2357724,1.607602 l 0,0.02144 0.021432,0.02143 c 0.063617,0.182229 0.1561942,0.28647 0.2786394,0.428695 0.1224453,0.142224 0.268425,0.30962 0.4072429,0.450128 0.016332,0.01653 0.0268,0.02677 0.042864,0.04288 0.02753,0.119804 0.060881,0.248737 0.085735,0.36439 0.066135,0.307705 0.059353,0.525608 0.042871,0.600171 C 2.6964736,7.280731 2.101329,7.480767 1.5673092,7.712932 1.2674979,7.843276 0.9962013,7.959669 0.7742571,8.098757 0.5523138,8.237846 0.3315876,8.342929 0.259846,8.65606 c -9.199e-4,0.01427 -9.199e-4,0.0286 0,0.04288 -0.070103,0.643711 -0.176148,1.590293 -0.257206,2.229209 -0.017499,0.134489 0.053382,0.276262 0.1714704,0.342955 0.9696174,0.523769 2.4590634,0.734572 3.9438235,0.72878 1.4847593,-0.0058 2.9623436,-0.228982 3.9009551,-0.72878 0.118087,-0.06669 0.1889717,-0.208466 0.1714705,-0.342955 C 8.1644805,10.728435 8.1326895,10.278091 8.1046245,9.834978 8.0765575,9.391865 8.0521945,8.955983 8.0188915,8.698939 8.0072715,8.635219 7.9771485,8.574989 7.9331545,8.527461 7.6349911,8.171408 7.1895218,7.953747 6.6685589,7.734378 6.1929506,7.534107 5.6353752,7.326131 5.082457,7.091337 5.051511,7.022397 5.020771,6.821819 5.082457,6.5126 5.099022,6.42957 5.12496,6.340639 5.14676,6.255383 5.19872,6.197183 5.23922,6.149623 5.2967968,6.083906 5.4195951,5.943745 5.551542,5.796713 5.6611711,5.655212 5.770801,5.51371 5.8604934,5.392319 5.9183771,5.226517 l 0.021432,-0.02144 C 6.1638462,4.300845 6.1639629,3.923525 6.1755816,3.597474 l 0,-0.02143 c 0,-1.050672 -0.9444033,-1.864819 -2.057647,-1.864819 z M 10.003781,-1.6024174e-5 C 8.3807203,-1.6024174e-5 7.0038161,1.186928 7.0038161,2.718703 c 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 C 7.9313481,8.119786 7.0636518,8.411419 6.2850728,8.749892 5.8479602,8.93992 5.4524208,9.10961 5.1288354,9.312386 4.8052511,9.515163 4.4834415,9.668364 4.378845,10.124877 c -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499329,1.062488 2.164718,-0.0084 4.318975,-0.333832 5.687432,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.312472,-0.937489 -0.04512,-0.100507 -0.08994,-0.392929 0,-0.84374 0.02415,-0.121051 0.06197,-0.250702 0.09375,-0.374996 0.07576,-0.08485 0.134803,-0.154188 0.218748,-0.249997 0.179035,-0.20434 0.371408,-0.418698 0.531242,-0.624992 0.159836,-0.206295 0.290604,-0.383272 0.374996,-0.624994 L 12.66,5.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 C 13.003747,1.186948 11.626846,3.9858261e-6 10.003782,3.9858261e-6 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- id="path5493"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- id="path2880-5-3-9-2"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 4.1179357,2.711205 c -1.1132415,0 -2.0576469,0.814147 -2.0576469,1.86482 0.0079,0.332088 0.037602,0.741596 0.2357724,1.607602 l 0,0.02144 0.021432,0.02143 c 0.063617,0.182229 0.1561942,0.28647 0.2786394,0.428695 0.1224453,0.142224 0.268425,0.30962 0.4072429,0.450128 0.016332,0.01653 0.0268,0.02677 0.042864,0.04288 0.02753,0.119804 0.060881,0.248737 0.085735,0.36439 0.066135,0.307705 0.059353,0.525608 0.042871,0.600171 C 2.6964736,8.280731 2.101329,8.480767 1.5673092,8.712932 1.2674979,8.843276 0.9962013,8.959669 0.7742571,9.098757 0.5523138,9.237846 0.3315876,9.342929 0.259846,9.65606 c -9.199e-4,0.01427 -9.199e-4,0.0286 0,0.04288 -0.070103,0.643711 -0.176148,1.590293 -0.257206,2.229209 -0.017499,0.134489 0.053382,0.276262 0.1714704,0.342955 0.9696174,0.523769 2.4590634,0.734572 3.9438235,0.72878 1.4847593,-0.0058 2.9623436,-0.228982 3.9009551,-0.72878 0.118087,-0.06669 0.1889717,-0.208466 0.1714705,-0.342955 -0.025879,-0.199714 -0.05767,-0.650058 -0.085735,-1.093171 C 8.0765575,10.391865 8.0521945,9.955983 8.0188915,9.698939 8.0072715,9.635219 7.9771485,9.574989 7.9331545,9.527461 7.6349911,9.171408 7.1895218,8.953747 6.6685589,8.734378 6.1929506,8.534107 5.6353752,8.326131 5.082457,8.091337 5.051511,8.022397 5.020771,7.821819 5.082457,7.5126 5.099022,7.42957 5.12496,7.340639 5.14676,7.255383 5.19872,7.197183 5.23922,7.149623 5.2967968,7.083906 5.4195951,6.943745 5.551542,6.796713 5.6611711,6.655212 5.770801,6.51371 5.8604934,6.392319 5.9183771,6.226517 l 0.021432,-0.02144 C 6.1638462,5.300845 6.1639629,4.923525 6.1755816,4.597474 l 0,-0.02143 c 0,-1.050672 -0.9444033,-1.864819 -2.057647,-1.864819 z M 10.003781,0.99998399 c -1.6230607,0 -2.9999649,1.18694401 -2.9999649,2.71871901 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 -0.6974467,0.244883 -1.565143,0.536516 -2.343722,0.874989 -0.4371126,0.190028 -0.832652,0.359718 -1.1562374,0.562494 -0.3235843,0.202777 -0.6453939,0.355978 -0.7499904,0.812491 -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499329,1.062488 2.164718,-0.0084 4.318975,-0.333832 5.687432,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.312472,-0.937489 -0.04512,-0.100507 -0.08994,-0.392929 0,-0.84374 0.02415,-0.121051 0.06197,-0.250702 0.09375,-0.374996 0.07576,-0.08485 0.134803,-0.154188 0.218748,-0.249997 0.179035,-0.20434 0.371408,-0.418698 0.531242,-0.624992 0.159836,-0.206295 0.290604,-0.383272 0.374996,-0.624994 L 12.66,6.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 c 0,-1.531774 -1.376901,-2.718718 -2.999965,-2.718718 z" />
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.1179 1.7112c-1.1132 0-2.0576 0.81415-2.0576 1.8648 0.0079 0.33209 0.037602 0.7416 0.23577 1.6076v0.02144l0.021432 0.02143c0.063617 0.18223 0.15619 0.28647 0.27864 0.4287 0.12245 0.14222 0.26842 0.30962 0.40724 0.45013 0.016332 0.01653 0.0268 0.02677 0.042864 0.04288 0.02753 0.1198 0.060881 0.24874 0.085735 0.36439 0.066135 0.3077 0.059353 0.52561 0.042871 0.60017-0.4783 0.1679-1.0735 0.368-1.6075 0.6001-0.2998 0.1304-0.5711 0.2468-0.79304 0.3859-0.22195 0.139-0.44267 0.2441-0.51441 0.5573-0.0009199 0.01427-0.0009199 0.0286 0 0.04288-0.070103 0.64371-0.17615 1.5903-0.25721 2.2292-0.017499 0.13449 0.053382 0.27626 0.17147 0.34296 0.96962 0.52377 2.4591 0.73457 3.9438 0.72878 1.4848-0.0058 2.9623-0.22898 3.901-0.72878 0.11809-0.06669 0.18897-0.20847 0.17147-0.34296-0.0259-0.2-0.0577-0.65-0.0858-1.093-0.028-0.4431-0.0524-0.879-0.0857-1.1361-0.0116-0.0637-0.0418-0.1239-0.0857-0.1714-0.2982-0.3561-0.7437-0.5738-1.2646-0.7931-0.4756-0.2003-1.0332-0.4083-1.5861-0.6431-0.031-0.0689-0.0617-0.2695 0-0.5787 0.0165-0.083 0.0425-0.172 0.0643-0.2572 0.0519-0.0582 0.0924-0.1058 0.15-0.1715 0.1228-0.1402 0.2547-0.2872 0.3644-0.4287 0.1096-0.1415 0.1993-0.2629 0.2572-0.4287l0.021432-0.02144c0.224-0.9043 0.2242-1.2816 0.2358-1.6076v-0.02143c0-1.0507-0.9444-1.8648-2.0576-1.8648zm5.8861-1.7112c-1.6233 0-3.0002 1.1869-3.0002 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3597-1.1563 0.5625-0.3235 0.2028-0.6454 0.356-0.75 0.8126-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.04512-0.10051-0.08994-0.39293 0-0.84374 0.02415-0.12105 0.06197-0.2507 0.09375-0.375 0.07576-0.08485 0.1348-0.15419 0.21875-0.25 0.17904-0.20434 0.37141-0.4187 0.53124-0.62499 0.15984-0.2063 0.2906-0.38327 0.375-0.62499l0.032-0.0315c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5319-1.377-2.7188-3-2.7188z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.1179 2.7112c-1.1132 0-2.0576 0.81415-2.0576 1.8648 0.0079 0.33209 0.037602 0.7416 0.23577 1.6076v0.02144l0.021432 0.02143c0.063617 0.18223 0.15619 0.28647 0.27864 0.4287 0.12245 0.14222 0.26842 0.30962 0.40724 0.45013 0.016332 0.01653 0.0268 0.02677 0.042864 0.04288 0.02753 0.1198 0.060881 0.24874 0.085735 0.36439 0.066135 0.3077 0.059353 0.52561 0.042871 0.60017-0.4783 0.1679-1.0735 0.368-1.6075 0.6001-0.2998 0.1304-0.5711 0.2468-0.79304 0.3859-0.22195 0.139-0.44267 0.2441-0.51441 0.5573-0.0009199 0.01427-0.0009199 0.0286 0 0.04288-0.070103 0.64371-0.17615 1.5903-0.25721 2.2292-0.017499 0.13449 0.053382 0.27626 0.17147 0.34296 0.96962 0.52377 2.4591 0.73457 3.9438 0.72878 1.4848-0.0058 2.9623-0.22898 3.901-0.72878 0.11809-0.06669 0.18897-0.20847 0.17147-0.34296-0.025879-0.19971-0.05767-0.65006-0.085735-1.0932-0.0282-0.443-0.0526-0.879-0.0859-1.1361-0.0116-0.0637-0.0418-0.1239-0.0857-0.1714-0.2982-0.3561-0.7437-0.5738-1.2646-0.7931-0.4756-0.2003-1.0332-0.4083-1.5861-0.6431-0.031-0.0689-0.0617-0.2695 0-0.5787 0.0165-0.083 0.0425-0.172 0.0643-0.2572 0.0519-0.0582 0.0924-0.1058 0.15-0.1715 0.1228-0.1402 0.2547-0.2872 0.3644-0.4287 0.1096-0.1415 0.1993-0.2629 0.2572-0.4287l0.021432-0.02144c0.224-0.9043 0.2242-1.2816 0.2358-1.6076v-0.02143c0-1.0507-0.9444-1.8648-2.0576-1.8648zm5.8861-1.7112c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.69745 0.24488-1.5651 0.53652-2.3437 0.87499-0.43711 0.19003-0.83265 0.35972-1.1562 0.56249-0.32358 0.20278-0.64539 0.35598-0.74999 0.81249-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.04512-0.10051-0.08994-0.39293 0-0.84374 0.02415-0.12105 0.06197-0.2507 0.09375-0.375 0.07576-0.08485 0.1348-0.15419 0.21875-0.25 0.17904-0.20434 0.37141-0.4187 0.53124-0.62499 0.15984-0.2063 0.2906-0.38327 0.375-0.62499l0.031-0.0313c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5318-1.3769-2.7187-3-2.7187z" fill="#fff"/>
+ </g>
</svg>
diff --git a/settings/js/users.js b/settings/js/users.js
index 690c9ad046440998c8b787ee0a96fdc57f23d7f8..f3fab34b090cc6cb9a97f060a925be5df1a22daa 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -351,10 +351,14 @@ $(document).ready(function () {
input.keypress(function (event) {
if (event.keyCode == 13) {
if ($(this).val().length > 0) {
+ var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
$.post(
OC.filePath('settings', 'ajax', 'changepassword.php'),
- {username: uid, password: $(this).val()},
+ {username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
+ if (result.status != 'success') {
+ OC.Notification.show(t('admin', result.data.message));
+ }
}
);
input.blur();
@@ -368,6 +372,10 @@ $(document).ready(function () {
img.css('display', '');
});
});
+ $('input:password[id="recoveryPassword"]').keyup(function(event) {
+ OC.Notification.hide();
+ });
+
$('table').on('click', 'td.password', function (event) {
$(this).children('img').click();
});
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index d134ecad01d2915ef1507d73f2a129be054725a6..769c25d7bffedb2a217a42a4a5b94531f6213d25 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
"Login Name" => "Nom d'accés",
"Create" => "Crea",
+"Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
"Default Storage" => "Emmagatzemament per defecte",
"Unlimited" => "Il·limitat",
"Other" => "Un altre",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 91a96ca9f0ef24251c62b13feda15753c84037c3..f7f532397497feb80e9086aefca41bdafd326e76 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
"Login Name" => "Loginname",
"Create" => "Erstellen",
+"Admin Recovery Password" => "Admin-Paswort-Wiederherstellung",
"Default Storage" => "Standard-Speicher",
"Unlimited" => "Unbegrenzt",
"Other" => "Andere",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index aaf858cf2cf57fc5e82b010eab1a76849c32e171..137d3c8aff72bb3e51753d9d8b083077b887ef8b 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
"Login Name" => "Nombre de usuario",
"Create" => "Crear",
+"Admin Recovery Password" => "Recuperación de la contraseña de administración",
"Default Storage" => "Almacenamiento predeterminado",
"Unlimited" => "Ilimitado",
"Other" => "Otro",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f6e378177a6610dcd031b035134eb6ea39330cf3..f7eb7dd5c2d3552f8438d77c976529600787357a 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error al autenticar",
+"Your display name has been changed." => "El nombre mostrado fue cambiado",
"Unable to change display name" => "No fue posible cambiar el nombre mostrado",
"Group already exists" => "El grupo ya existe",
"Unable to add group" => "No fue posible añadir el grupo",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index e52fce624d458e0e87d8b4a2a670ff6d8670e5be..8a9e237e1208ae5c19f195eaff44846345f0c463 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -27,7 +27,7 @@
"Saving..." => "Salvestamine...",
"deleted" => "kustutatud",
"undo" => "tagasi",
-"Unable to remove user" => "Ei suuda kustutada kasutajat eemaldada",
+"Unable to remove user" => "Kasutaja eemaldamine ebaõnnestus",
"Groups" => "Grupid",
"Group Admin" => "Grupi admin",
"Delete" => "Kustuta",
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga",
"Login Name" => "Kasutajanimi",
"Create" => "Lisa",
+"Admin Recovery Password" => "Admin taasteparool",
"Default Storage" => "Vaikimisi maht",
"Unlimited" => "Piiramatult",
"Other" => "Muu",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 61e86a83f3355776a59a9066ead62fae043f1d01..05f3dc07c4a64db23ac8a098f4a9bedb3ab24a5a 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros",
"Login Name" => "Nome de acceso",
"Create" => "Crear",
+"Admin Recovery Password" => "Recuperación do contrasinal do administrador",
"Default Storage" => "Almacenamento predeterminado",
"Unlimited" => "Sen límites",
"Other" => "Outro",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 178fd1d73e1dbae9cf7e1fc903c8fbedde616689..70cbf3d13652e8a571ef657f2c8d03aaf3011afc 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.",
"Login Name" => "Bejelentkezési név",
"Create" => "Létrehozás",
+"Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
"Default Storage" => "Alapértelmezett tárhely",
"Unlimited" => "Korlátlan",
"Other" => "Más",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 74f8e17c78273dc238207add79b43118af3a8581..38c22ea06dea33438664f80f75ae6f825f2eefef 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -66,7 +66,7 @@
"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL.",
"Log" => "Log",
"Log level" => "Livello di log",
-"More" => "Più",
+"More" => "Altro",
"Less" => "Meno",
"Version" => "Versione",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
"Login Name" => "Nome utente",
"Create" => "Crea",
+"Admin Recovery Password" => "Password di ripristino amministrativa",
"Default Storage" => "Archiviazione predefinita",
"Unlimited" => "Illimitata",
"Other" => "Altro",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index defc96e81b6a5b27f7d0cf1e8a28cd9915b00d35..ad42d3f085b90cdeffc0fdc275c7520aafdd8185 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
"Login Name" => "ログイン名",
"Create" => "作成",
+"Admin Recovery Password" => "管理者復旧パスワード",
"Default Storage" => "デフォルトストレージ",
"Unlimited" => "無制限",
"Other" => "その他",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index fbb35baa742aa5cec0b4fdbf44353e400e7a5f4d..9f18bf472acddcd98607e77e7ca70bfcb31ee9e7 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,6 +1,8 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
-"Authentication error" => "Autentikasjonsfeil",
+"Authentication error" => "Autentiseringsfeil",
+"Your display name has been changed." => "Ditt visningsnavn er blitt endret.",
+"Unable to change display name" => "Kunne ikke endre visningsnavn",
"Group already exists" => "Gruppen finnes allerede",
"Unable to add group" => "Kan ikke legge til gruppe",
"Could not enable app. " => "Kan ikke aktivere app.",
@@ -10,53 +12,100 @@
"Unable to delete user" => "Kan ikke slette bruker",
"Language changed" => "Språk endret",
"Invalid request" => "Ugyldig forespørsel",
+"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
+"Couldn't update app." => "Kunne ikke oppdatere app.",
+"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå avBehandle ",
"Enable" => "Aktiver",
+"Please wait...." => "Vennligst vent...",
"Error" => "Feil",
+"Updating...." => "Oppdaterer...",
+"Error while updating app" => "Feil ved oppdatering av app",
+"Updated" => "Oppdatert",
"Saving..." => "Lagrer...",
"deleted" => "slettet",
"undo" => "angre",
+"Unable to remove user" => "Kunne ikke slette bruker",
"Groups" => "Grupper",
"Group Admin" => "Gruppeadministrator",
"Delete" => "Slett",
+"add group" => "legg til gruppe",
+"A valid username must be provided" => "Oppgi et gyldig brukernavn",
+"Error creating user" => "Feil ved oppretting av bruker",
+"A valid password must be provided" => "Oppgi et gyldig passord",
"__language_name__" => "__language_name__",
"Security Warning" => "Sikkerhetsadvarsel",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde.",
+"Setup Warning" => "Installasjonsadvarsel",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+"Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+"Locale not working" => "Språk virker ikke",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s.",
+"Internet connection not working" => "Ingen internettilkopling",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud.",
"Cron" => "Cron",
+"Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden i ownCloud rot hvert minutt vha http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt.",
"Sharing" => "Deling",
+"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 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",
"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
+"Security" => "Sikkerhet",
+"Enforce HTTPS" => "Tving HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvinger klienter til å bruke ownCloud via kryptert tilkopling.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL.",
"Log" => "Logg",
"Log level" => "Loggnivå",
"More" => "Mer",
"Less" => "Mindre",
"Version" => "Versjon",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Legg til din App",
"More Apps" => "Flere Apps",
"Select an App" => "Velg en app",
"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
"Update" => "Oppdater",
"User Documentation" => "Brukerdokumentasjon",
"Administrator Documentation" => "Administratordokumentasjon",
+"Online Documentation" => "Online dokumentasjon",
+"Forum" => "Forum",
+"Bugtracker" => "Feilsporing",
"Commercial Support" => "Kommersiell støtte",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
"Get the apps to sync your files" => "Få dine apps til å synkronisere dine filer",
+"Show First Run Wizard again" => "Vis \"Førstegangs veiveiseren\" på nytt",
"Password" => "Passord",
"Your password was changed" => "Passord har blitt endret",
"Unable to change your password" => "Kunne ikke endre passordet ditt",
"Current password" => "Nåværende passord",
"New password" => "Nytt passord",
"Change password" => "Endre passord",
+"Display Name" => "Visningsnavn",
"Email" => "Epost",
"Your email address" => "Din e-postadresse",
"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
"Language" => "Språk",
"Help translate" => "Bidra til oversettelsen",
"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressen for å kople til ownCloud i din filbehandler",
+"Login Name" => "Logginn navn",
"Create" => "Opprett",
-"Other" => "Annet"
+"Default Storage" => "Standard lager",
+"Unlimited" => "Ubegrenset",
+"Other" => "Annet",
+"Storage" => "Lager",
+"change display name" => "endre visningsnavn",
+"set new password" => "sett nytt passord",
+"Default" => "Standard"
);
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d22b04ad571e970e27d4bb61649eed59d99fd45a..00de9e8b49ac6bda9dd5c27054bb41f5755adf02 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
"Login Name" => "Inlognaam",
"Create" => "Creëer",
+"Admin Recovery Password" => "Beheer herstel wachtwoord",
"Default Storage" => "Default opslag",
"Unlimited" => "Ongelimiteerd",
"Other" => "Anders",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 0e4d0a66a1460b97ad1e831afcf7370c7b2dbaab..3008873c861c750ed7db5a7bccf76fb2de2d143c 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,21 +1,21 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
"Authentication error" => "Autentiseringsfeil",
-"Your display name has been changed." => "Visningsnamnet ditt er endra.",
-"Unable to change display name" => "Klarte ikkje å endra visningsnamnet",
+"Your display name has been changed." => "Visingsnamnet ditt er endra.",
+"Unable to change display name" => "Klarte ikkje endra visingsnamnet",
"Group already exists" => "Gruppa finst allereie",
-"Unable to add group" => "Klarte ikkje å leggja til gruppa",
-"Could not enable app. " => "Klarte ikkje å aktivera app-en.",
+"Unable to add group" => "Klarte ikkje leggja til gruppa",
+"Could not enable app. " => "Klarte ikkje slå på programmet.",
"Email saved" => "E-postadresse lagra",
"Invalid email" => "Ugyldig e-postadresse",
"Unable to delete group" => "Klarte ikkje å sletta gruppa",
-"Unable to delete user" => "Klarte ikkje å sletta brukaren",
+"Unable to delete user" => "Klarte ikkje sletta brukaren",
"Language changed" => "Språk endra",
"Invalid request" => "Ugyldig førespurnad",
"Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
-"Unable to add user to group %s" => "Klarte ikkje å leggja til brukaren til gruppa %s",
-"Unable to remove user from group %s" => "Klarte ikkje å fjerna brukaren frå gruppa %s",
-"Couldn't update app." => "Klarte ikkje å oppdatera app-en.",
+"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
+"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
+"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå av",
"Enable" => "Slå på",
@@ -27,7 +27,7 @@
"Saving..." => "Lagrar …",
"deleted" => "sletta",
"undo" => "angra",
-"Unable to remove user" => "Klarte ikkje å fjerna brukaren",
+"Unable to remove user" => "Klarte ikkje fjerna brukaren",
"Groups" => "Grupper",
"Group Admin" => "Gruppestyrar",
"Delete" => "Slett",
@@ -42,17 +42,17 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
"Locale not working" => "Regionaldata fungerer ikkje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s.",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s.",
"Internet connection not working" => "Nettilkoplinga fungerer ikkje",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http.",
"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet.",
"Sharing" => "Deling",
-"Enable Share API" => "Skru på API-et for deling",
+"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",
@@ -63,7 +63,7 @@
"Security" => "Tryggleik",
"Enforce HTTPS" => "Krev HTTPS",
"Enforces the clients to connect to ownCloud via an encrypted connection." => "Krev at klientar koplar til ownCloud med ei kryptert tilkopling.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga.",
"Log" => "Logg",
"Log level" => "Log nivå",
"More" => "Meir",
@@ -72,8 +72,8 @@
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Legg til din app",
"More Apps" => "Fleire app-ar",
-"Select an App" => "Vel ein applikasjon",
-"See application page at apps.owncloud.com" => "Sjå applikasjonssida på apps.owncloud.com",
+"Select an App" => "Vel eit program",
+"See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
"Update" => "Oppdater",
"User Documentation" => "Brukardokumentasjon",
@@ -87,14 +87,14 @@
"Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
"Password" => "Passord",
"Your password was changed" => "Passordet ditt er endra",
-"Unable to change your password" => "Klarte ikkje å endra passordet",
+"Unable to change your password" => "Klarte ikkje endra passordet",
"Current password" => "Passord",
"New password" => "Nytt passord",
"Change password" => "Endra passord",
-"Display Name" => "Visningsnamn",
+"Display Name" => "Visingsnamn",
"Email" => "E-post",
"Your email address" => "Di epost-adresse",
-"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å aktivera passordgjenoppretting",
+"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
"Language" => "Språk",
"Help translate" => "Hjelp oss å omsetja",
"WebDAV" => "WebDAV",
@@ -105,7 +105,7 @@
"Unlimited" => "Ubegrensa",
"Other" => "Anna",
"Storage" => "Lagring",
-"change display name" => "endra visningsnamn",
+"change display name" => "endra visingsnamn",
"set new password" => "lag nytt passord",
"Default" => "Standard"
);
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index e422601e2d800f8ecf522d5b08ec49c8d2ac6a95..908a930339d928cafb8fe38953efe715ae9f8b9e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
"Authentication error" => "Błąd uwierzytelniania",
+"Your display name has been changed." => "Twoje wyświetlana nazwa została zmieniona.",
"Unable to change display name" => "Nie można zmienić wyświetlanej nazwy",
"Group already exists" => "Grupa już istnieje",
"Unable to add group" => "Nie można dodać grupy",
@@ -100,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
"Login Name" => "Login",
"Create" => "Utwórz",
+"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
"Default Storage" => "Magazyn domyślny",
"Unlimited" => "Bez limitu",
"Other" => "Inne",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index f1e45aab150cf1a1424fb083885335cc42b5cd89..824940da583d89e75504ad98237ccc9275fcd618 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos",
"Login Name" => "Nome de Login",
"Create" => "Criar",
+"Admin Recovery Password" => "Recuperação da Senha do Administrador",
"Default Storage" => "Armazenamento Padrão",
"Unlimited" => "Ilimitado",
"Other" => "Outro",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index de32c3b1f025fd53bd6584f7c9bdc08acfa606ce..c5fc1a009267ef74ac74893148f7d3ac3c9c7a6e 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
"Login Name" => "Nome de utilizador",
"Create" => "Criar",
+"Admin Recovery Password" => "Recuperar password de administrador",
"Default Storage" => "Armazenamento Padrão",
"Unlimited" => "Ilimitado",
"Other" => "Outro",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 88aa2c905abb4f3da611643c0aa223137aa15128..d80f7b087347d87c7be7cb79c54d5ac8ed6525c6 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,3 +1,9 @@
<?php $TRANSLATIONS = array(
-"deleted" => "удалено"
+"Error" => "Ошибка",
+"Saving..." => "Сохранение",
+"deleted" => "удалено",
+"Groups" => "Группы",
+"Delete" => "Удалить",
+"Email" => "Email",
+"Other" => "Другое"
);
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 377af0011d14be05001d1ac82fbbe316fbf8ed40..5d8445b4b3b85fc9462d26c6e40df25101c44926 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi",
"Login Name" => "Prihlasovacie meno",
"Create" => "Vytvoriť",
+"Admin Recovery Password" => "Obnovenie hesla administrátora",
"Default Storage" => "Predvolené úložisko",
"Unlimited" => "Nelimitované",
"Other" => "Iné",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 06c1fe0e7c18254b75fe830c73dd674f69563740..aca20f15e5c2dc8f6f3a705e30563ff0d2c09d72 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "在您的檔案管理員中使用這個地址來連線到 ownCloud",
"Login Name" => "登入名稱",
"Create" => "建立",
+"Admin Recovery Password" => "管理者復原密碼",
"Default Storage" => "預設儲存區",
"Unlimited" => "無限制",
"Other" => "其他",
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index cfb45e99c4d4c8855cd5c3e89b076ec2683dc69b..f0002c505c801a13fe51d2497e35a5fbab52f479 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -38,7 +38,7 @@ if($_['passwordChangeSupported']) {
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
- <input type="password" id="pass2" name="newpassword"
+ <input type="password" id="pass2" name="password"
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
@@ -63,6 +63,9 @@ if($_['displayNameChangeSupported']) {
}
?>
+<?php
+if($_['passwordChangeSupported']) {
+?>
<form id="lostpassword">
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Email'));?></strong></legend>
@@ -71,6 +74,9 @@ if($_['displayNameChangeSupported']) {
<em><?php p($l->t('Fill in an email address to enable password recovery'));?></em>
</fieldset>
</form>
+<?php
+}
+?>
<form>
<fieldset class="personalblock">
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e86dd46efbe42f94cc18b5283bf3afecd27f8cd4..a6df85983dd6c52e7ac67c10ae93c3fce7bb0c11 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -29,6 +29,11 @@ $_['subadmingroups'] = array_flip($items);
<?php endforeach;?>
</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
</form>
+ <?php if((bool)$_['recoveryAdminEnabled']): ?>
+ <div class="recoveryPassword">
+ <input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" />
+ </div>
+ <?php endif; ?>
<div class="quota">
<span><?php p($l->t('Default Storage'));?></span>
<?php if((bool) $_['isadmin']): ?>
diff --git a/settings/users.php b/settings/users.php
index 94e6d0a9a10f9ee5751b7d5b645692642a0c5871..e5c8a7aaa8d2963f6aab0dae4ddc57c689dbab36 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -20,6 +20,8 @@ $users = array();
$groups = array();
$isadmin = OC_User::isAdminUser(OC_User::getUser());
+$recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
+ OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
if($isadmin) {
$accessiblegroups = OC_Group::getGroups();
@@ -77,4 +79,5 @@ $tmpl->assign( 'numofgroups', count($accessiblegroups));
$tmpl->assign( 'quota_preset', $quotaPreset);
$tmpl->assign( 'default_quota', $defaultQuota);
$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
+$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
$tmpl->printPage();
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 44af0115650dff1e6f52f756c96ae49b3bfc6067..111ed0e13572770ecbd170cf67bb498c973d4b33 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -8,6 +8,7 @@
require_once __DIR__.'/../lib/base.php';
+OC_App::enable('files_encryption');
OC_App::enable('calendar');
OC_App::enable('contacts');
OC_App::enable('apptemplateadvanced');
diff --git a/tests/lib/backgroundjob/dummyjoblist.php b/tests/lib/backgroundjob/dummyjoblist.php
new file mode 100644
index 0000000000000000000000000000000000000000..d91d6b344b5f05d2c8410675c0d15970b299a064
--- /dev/null
+++ b/tests/lib/backgroundjob/dummyjoblist.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class JobRun extends \Exception {
+}
+
+/**
+ * Class DummyJobList
+ *
+ * in memory job list for testing purposes
+ */
+class DummyJobList extends \OC\BackgroundJob\JobList {
+ /**
+ * @var \OC\BackgroundJob\Job[]
+ */
+ private $jobs = array();
+
+ private $last = 0;
+
+ /**
+ * @param \OC\BackgroundJob\Job|string $job
+ * @param mixed $argument
+ */
+ public function add($job, $argument = null) {
+ $job->setArgument($argument);
+ if (!$this->has($job, null)) {
+ $this->jobs[] = $job;
+ }
+ }
+
+ /**
+ * @param \OC\BackgroundJob\Job|string $job
+ * @param mixed $argument
+ */
+ public function remove($job, $argument = null) {
+ $index = array_search($job, $this->jobs);
+ if ($index !== false) {
+ unset($this->jobs[$index]);
+ }
+ }
+
+ /**
+ * check if a job is in the list
+ *
+ * @param $job
+ * @param mixed $argument
+ * @return bool
+ */
+ public function has($job, $argument) {
+ return array_search($job, $this->jobs) !== false;
+ }
+
+ /**
+ * get all jobs in the list
+ *
+ * @return \OC\BackgroundJob\Job[]
+ */
+ public function getAll() {
+ return $this->jobs;
+ }
+
+ /**
+ * get the next job in the list
+ *
+ * @return \OC\BackgroundJob\Job
+ */
+ public function getNext() {
+ if (count($this->jobs) > 0) {
+ if ($this->last < (count($this->jobs) - 1)) {
+ $i = $this->last + 1;
+ } else {
+ $i = 0;
+ }
+ return $this->jobs[$i];
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * set the job that was last ran
+ *
+ * @param \OC\BackgroundJob\Job $job
+ */
+ public function setLastJob($job) {
+ $i = array_search($job, $this->jobs);
+ if ($i !== false) {
+ $this->last = $i;
+ } else {
+ $this->last = 0;
+ }
+ }
+
+ /**
+ * @param int $id
+ * @return Job
+ */
+ public function getById($id) {
+ foreach ($this->jobs as $job) {
+ if ($job->getId() === $id) {
+ return $job;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * get the id of the last ran job
+ *
+ * @return int
+ */
+ public function getLastJob() {
+ return $this->last;
+ }
+
+ /**
+ * set the lastRun of $job to now
+ *
+ * @param \OC\BackgroundJob\Job $job
+ */
+ public function setLastRun($job) {
+ $job->setLastRun(time());
+ }
+}
diff --git a/tests/lib/backgroundjob/queuedjob.php b/tests/lib/backgroundjob/queuedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d373473cd7ae1b7e5c0469363e7fbe519fa042c
--- /dev/null
+++ b/tests/lib/backgroundjob/queuedjob.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class TestQueuedJob extends \OC\BackgroundJob\QueuedJob {
+ public function run($argument) {
+ throw new JobRun(); //throw an exception so we can detect if this function is called
+ }
+}
+
+class QueuedJob extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var DummyJobList $jobList
+ */
+ private $jobList;
+ /**
+ * @var \OC\BackgroundJob\TimedJob $job
+ */
+ private $job;
+
+ public function setup() {
+ $this->jobList = new DummyJobList();
+ $this->job = new TestQueuedJob();
+ $this->jobList->add($this->job);
+ }
+
+ public function testJobShouldBeRemoved() {
+ try {
+ $this->assertTrue($this->jobList->has($this->job, null));
+ $this->job->execute($this->jobList);
+ $this->fail("job should have been run");
+ } catch (JobRun $e) {
+ $this->assertFalse($this->jobList->has($this->job, null));
+ }
+ }
+}
diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..0af933afef873adea45a7e3bfb84557ccac433fa
--- /dev/null
+++ b/tests/lib/backgroundjob/timedjob.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class TestTimedJob extends \OC\BackgroundJob\TimedJob {
+ public function __construct() {
+ $this->setInterval(10);
+ }
+
+ public function run($argument) {
+ throw new JobRun(); //throw an exception so we can detect if this function is called
+ }
+}
+
+class TimedJob extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var DummyJobList $jobList
+ */
+ private $jobList;
+ /**
+ * @var \OC\BackgroundJob\TimedJob $job
+ */
+ private $job;
+
+ public function setup() {
+ $this->jobList = new DummyJobList();
+ $this->job = new TestTimedJob();
+ $this->jobList->add($this->job);
+ }
+
+ public function testShouldRunAfterInterval() {
+ $this->job->setLastRun(time() - 12);
+ try {
+ $this->job->execute($this->jobList);
+ $this->fail("job should have run");
+ } catch (JobRun $e) {
+ }
+ }
+
+ public function testShouldNotRunWithinInterval() {
+ $this->job->setLastRun(time() - 5);
+ try {
+ $this->job->execute($this->jobList);
+ } catch (JobRun $e) {
+ $this->fail("job should not have run");
+ }
+ }
+
+ public function testShouldNotTwice() {
+ $this->job->setLastRun(time() - 15);
+ try {
+ $this->job->execute($this->jobList);
+ $this->fail("job should have run the first time");
+ } catch (JobRun $e) {
+ try {
+ $this->job->execute($this->jobList);
+ } catch (JobRun $e) {
+ $this->fail("job should not have run the second time");
+ }
+ }
+ }
+}
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 5dcd3268804065bf4fd6fae79df87866eca76092..038cb21b2576a54ac1b76d635a3279951a0a94d5 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -22,7 +22,8 @@
class Test_Cache_File extends Test_Cache {
private $user;
-
+ private $datadir;
+
function skip() {
//$this->skipUnless(OC_User::isLoggedIn());
}
@@ -31,15 +32,20 @@ class Test_Cache_File extends Test_Cache {
//clear all proxies and hooks so we can do clean testing
OC_FileProxy::clearProxies();
OC_Hook::clear('OC_Filesystem');
-
+
+ //disabled atm
//enable only the encryption hook if needed
- if(OC_App::isEnabled('files_encryption')) {
- OC_FileProxy::register(new OC_FileProxy_Encryption());
- }
-
+ //if(OC_App::isEnabled('files_encryption')) {
+ // OC_FileProxy::register(new OC_FileProxy_Encryption());
+ //}
+
//set up temporary storage
\OC\Files\Filesystem::clearMounts();
- \OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
+ $storage = new \OC\Files\Storage\Temporary(array());
+ \OC\Files\Filesystem::mount($storage,array(),'/');
+ $datadir = str_replace('local::', '', $storage->getId());
+ $this->datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
+ OC_Config::setValue('datadirectory', $datadir);
OC_User::clearBackends();
OC_User::useBackend(new OC_User_Dummy());
@@ -59,5 +65,6 @@ class Test_Cache_File extends Test_Cache {
public function tearDown() {
OC_User::setUserId($this->user);
+ OC_Config::setValue('datadirectory', $this->datadir);
}
}
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 4051a6e234b4177e5d041a73e0f783dbbb4d7603..f272655925b6633fdf7a4226f9f70140e8001c63 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -8,6 +8,8 @@
namespace Test\Files\Cache;
+use PHPUnit_Framework_MockObject_MockObject;
+
class LongId extends \OC\Files\Storage\Temporary {
public function getId() {
return 'long:' . str_repeat('foo', 50) . parent::getId();
@@ -19,11 +21,19 @@ class Cache extends \PHPUnit_Framework_TestCase {
* @var \OC\Files\Storage\Temporary $storage;
*/
private $storage;
+ /**
+ * @var \OC\Files\Storage\Temporary $storage2;
+ */
+ private $storage2;
/**
* @var \OC\Files\Cache\Cache $cache
*/
private $cache;
+ /**
+ * @var \OC\Files\Cache\Cache $cache2
+ */
+ private $cache2;
public function testSimple() {
$file1 = 'foo';
@@ -170,6 +180,13 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->cache->put($file4, $data);
$this->cache->put($file5, $data);
+ /* simulate a second user with a different storage id but the same folder structure */
+ $this->cache2->put($file1, $folderData);
+ $this->cache2->put($file2, $folderData);
+ $this->cache2->put($file3, $folderData);
+ $this->cache2->put($file4, $data);
+ $this->cache2->put($file5, $data);
+
$this->cache->move('folder/foo', 'folder/foobar');
$this->assertFalse($this->cache->inCache('folder/foo'));
@@ -180,6 +197,16 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->assertTrue($this->cache->inCache('folder/foobar'));
$this->assertTrue($this->cache->inCache('folder/foobar/1'));
$this->assertTrue($this->cache->inCache('folder/foobar/2'));
+
+ /* the folder structure of the second user must not change! */
+ $this->assertTrue($this->cache2->inCache('folder/bar'));
+ $this->assertTrue($this->cache2->inCache('folder/foo'));
+ $this->assertTrue($this->cache2->inCache('folder/foo/1'));
+ $this->assertTrue($this->cache2->inCache('folder/foo/2'));
+
+ $this->assertFalse($this->cache2->inCache('folder/foobar'));
+ $this->assertFalse($this->cache2->inCache('folder/foobar/1'));
+ $this->assertFalse($this->cache2->inCache('folder/foobar/2'));
}
function testGetIncomplete() {
@@ -211,6 +238,23 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->assertEquals(array($storageId, 'foo'), \OC\Files\Cache\Cache::getById($id));
}
+ function testStorageMTime() {
+ $data = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file');
+ $this->cache->put('foo', $data);
+ $cachedData = $this->cache->get('foo');
+ $this->assertEquals($data['mtime'], $cachedData['storage_mtime']);//if no storage_mtime is saved, mtime should be used
+
+ $this->cache->put('foo', array('storage_mtime' => 30));//when setting storage_mtime, mtime is also set
+ $cachedData = $this->cache->get('foo');
+ $this->assertEquals(30, $cachedData['storage_mtime']);
+ $this->assertEquals(30, $cachedData['mtime']);
+
+ $this->cache->put('foo', array('mtime' => 25));//setting mtime does not change storage_mtime
+ $cachedData = $this->cache->get('foo');
+ $this->assertEquals(30, $cachedData['storage_mtime']);
+ $this->assertEquals(25, $cachedData['mtime']);
+ }
+
function testLongId() {
$storage = new LongId(array());
$cache = $storage->getCache();
@@ -220,12 +264,97 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->assertEquals(array(md5($storageId), 'foo'), \OC\Files\Cache\Cache::getById($id));
}
+ /**
+ * @brief this test show the bug resulting if we have no normalizer installed
+ */
+ public function testWithoutNormalizer() {
+ // folder name "Schön" with U+00F6 (normalized)
+ $folderWith00F6 = "\x53\x63\x68\xc3\xb6\x6e";
+
+ // folder name "Schön" with U+0308 (un-normalized)
+ $folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e";
+
+ /**
+ * @var \OC\Files\Cache\Cache | PHPUnit_Framework_MockObject_MockObject $cacheMock
+ */
+ $cacheMock = $this->getMock('\OC\Files\Cache\Cache', array('normalize'), array($this->storage), '', true);
+
+ $cacheMock->expects($this->any())
+ ->method('normalize')
+ ->will($this->returnArgument(0));
+
+ $data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
+
+ // put root folder
+ $this->assertFalse($cacheMock->get('folder'));
+ $this->assertGreaterThan(0, $cacheMock->put('folder', $data));
+
+ // put un-normalized folder
+ $this->assertFalse($cacheMock->get('folder/' .$folderWith0308));
+ $this->assertGreaterThan(0, $cacheMock->put('folder/' .$folderWith0308, $data));
+
+ // get un-normalized folder by name
+ $unNormalizedFolderName = $cacheMock->get('folder/' .$folderWith0308);
+
+ // check if database layer normalized the folder name (this should not happen)
+ $this->assertEquals($folderWith0308, $unNormalizedFolderName['name']);
+
+ // put normalized folder
+ $this->assertFalse($cacheMock->get('folder/' . $folderWith00F6));
+ $this->assertGreaterThan(0, $cacheMock->put('folder/' .$folderWith00F6, $data));
+
+ // this is our bug, we have two different hashes with the same name (Schön)
+ $this->assertEquals(2, count($cacheMock->getFolderContents('folder')));
+ }
+
+ /**
+ * @brief this test shows that there is no bug if we use the normalizer
+ */
+ public function testWithNormalizer() {
+
+ if(!class_exists('Patchwork\PHP\Shim\Normalizer')) {
+ $this->markTestSkipped('The 3rdparty Normalizer extension is not available.');
+ return;
+ }
+
+ // folder name "Schön" with U+00F6 (normalized)
+ $folderWith00F6 = "\x53\x63\x68\xc3\xb6\x6e";
+
+ // folder name "Schön" with U+0308 (un-normalized)
+ $folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e";
+
+ $data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
+
+ // put root folder
+ $this->assertFalse($this->cache->get('folder'));
+ $this->assertGreaterThan(0, $this->cache->put('folder', $data));
+
+ // put un-normalized folder
+ $this->assertFalse($this->cache->get('folder/' .$folderWith0308));
+ $this->assertGreaterThan(0, $this->cache->put('folder/' .$folderWith0308, $data));
+
+ // get un-normalized folder by name
+ $unNormalizedFolderName = $this->cache->get('folder/' .$folderWith0308);
+
+ // check if folder name was normalized
+ $this->assertEquals($folderWith00F6, $unNormalizedFolderName['name']);
+
+ // put normalized folder
+ $this->assertTrue(is_array($this->cache->get('folder/' . $folderWith00F6)));
+ $this->assertGreaterThan(0, $this->cache->put('folder/' .$folderWith00F6, $data));
+
+ // at this point we should have only one folder named "Schön"
+ $this->assertEquals(1, count($this->cache->getFolderContents('folder')));
+ }
+
public function tearDown() {
$this->cache->clear();
}
public function setUp() {
$this->storage = new \OC\Files\Storage\Temporary(array());
+ $this->storage2 = new \OC\Files\Storage\Temporary(array());
$this->cache = new \OC\Files\Cache\Cache($this->storage);
+ $this->cache2 = new \OC\Files\Cache\Cache($this->storage2);
}
}
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index 8ef6ab44d102f72349dc4d0c15092569933d8d15..e43c86ed4387636347dcb5e0a74acbd1bbb20ecb 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -35,7 +35,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$updater = $storage->getWatcher();
//set the mtime to the past so it can detect an mtime change
- $cache->put('', array('mtime' => 10));
+ $cache->put('', array('storage_mtime' => 10));
$this->assertTrue($cache->inCache('folder/bar.txt'));
$this->assertTrue($cache->inCache('folder/bar2.txt'));
@@ -47,14 +47,14 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$cachedData = $cache->get('bar.test');
$this->assertEquals(3, $cachedData['size']);
- $cache->put('bar.test', array('mtime' => 10));
+ $cache->put('bar.test', array('storage_mtime' => 10));
$storage->file_put_contents('bar.test', 'test data');
$updater->checkUpdate('bar.test');
$cachedData = $cache->get('bar.test');
$this->assertEquals(9, $cachedData['size']);
- $cache->put('folder', array('mtime' => 10));
+ $cache->put('folder', array('storage_mtime' => 10));
$storage->unlink('folder/bar2.txt');
$updater->checkUpdate('folder');
@@ -69,7 +69,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$updater = $storage->getWatcher();
//set the mtime to the past so it can detect an mtime change
- $cache->put('', array('mtime' => 10));
+ $cache->put('', array('storage_mtime' => 10));
$storage->unlink('foo.txt');
$storage->rename('folder', 'foo.txt');
@@ -85,7 +85,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$updater = $storage->getWatcher();
//set the mtime to the past so it can detect an mtime change
- $cache->put('foo.txt', array('mtime' => 10));
+ $cache->put('foo.txt', array('storage_mtime' => 10));
$storage->unlink('foo.txt');
$storage->rename('folder', 'foo.txt');
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 6ce45e6178a7c15c9c43d9e1163a4484a702ef4a..bef70cc725b167c4ced0495c31638d8571f1a88c 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -72,7 +72,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('\path'));
$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo//bar/'));
$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo////bar'));
- if (class_exists('Normalizer')) {
+ if (class_exists('Patchwork\PHP\Shim\Normalizer')) {
$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88"));
}
}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index a064e44f3efdaea1850014f0193c1cf3145aa96c..01f9a9cca11966aeab52320319a31112131c8d9a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -7,6 +7,12 @@
namespace Test\Files;
+class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
+ public function touch($path, $mtime = null) {
+ return false;
+ }
+}
+
class View extends \PHPUnit_Framework_TestCase {
/**
* @var \OC\Files\Storage\Storage[] $storages;
@@ -220,7 +226,7 @@ class View extends \PHPUnit_Framework_TestCase {
$cachedData = $rootView->getFileInfo('foo.txt');
$this->assertEquals(16, $cachedData['size']);
- $rootView->putFileInfo('foo.txt', array('mtime' => 10));
+ $rootView->putFileInfo('foo.txt', array('storage_mtime' => 10));
$storage1->file_put_contents('foo.txt', 'foo');
clearstatcache();
@@ -228,12 +234,73 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals(3, $cachedData['size']);
}
+ function testCopyBetweenStorages() {
+ $storage1 = $this->getTestStorage();
+ $storage2 = $this->getTestStorage();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ \OC\Files\Filesystem::mount($storage2, array(), '/substorage');
+
+ $rootView = new \OC\Files\View('');
+ $rootView->mkdir('substorage/emptyfolder');
+ $rootView->copy('substorage', 'anotherfolder');
+ $this->assertTrue($rootView->is_dir('/anotherfolder'));
+ $this->assertTrue($rootView->is_dir('/substorage'));
+ $this->assertTrue($rootView->is_dir('/anotherfolder/emptyfolder'));
+ $this->assertTrue($rootView->is_dir('/substorage/emptyfolder'));
+ $this->assertTrue($rootView->file_exists('/anotherfolder/foo.txt'));
+ $this->assertTrue($rootView->file_exists('/anotherfolder/foo.png'));
+ $this->assertTrue($rootView->file_exists('/anotherfolder/folder/bar.txt'));
+ $this->assertTrue($rootView->file_exists('/substorage/foo.txt'));
+ $this->assertTrue($rootView->file_exists('/substorage/foo.png'));
+ $this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt'));
+ }
+
+ function testMoveBetweenStorages() {
+ $storage1 = $this->getTestStorage();
+ $storage2 = $this->getTestStorage();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ \OC\Files\Filesystem::mount($storage2, array(), '/substorage');
+
+ $rootView = new \OC\Files\View('');
+ $rootView->rename('foo.txt', 'substorage/folder/foo.txt');
+ $this->assertFalse($rootView->file_exists('foo.txt'));
+ $this->assertTrue($rootView->file_exists('substorage/folder/foo.txt'));
+ $rootView->rename('substorage/folder', 'anotherfolder');
+ $this->assertFalse($rootView->is_dir('substorage/folder'));
+ $this->assertTrue($rootView->file_exists('anotherfolder/foo.txt'));
+ $this->assertTrue($rootView->file_exists('anotherfolder/bar.txt'));
+ }
+
+ function testTouch() {
+ $storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch');
+
+ \OC\Files\Filesystem::mount($storage, array(), '/');
+
+ $rootView = new \OC\Files\View('');
+ $oldCachedData = $rootView->getFileInfo('foo.txt');
+
+ $rootView->touch('foo.txt', 500);
+
+ $cachedData = $rootView->getFileInfo('foo.txt');
+ $this->assertEquals(500, $cachedData['mtime']);
+ $this->assertEquals($oldCachedData['storage_mtime'], $cachedData['storage_mtime']);
+
+ $rootView->putFileInfo('foo.txt', array('storage_mtime' => 1000)); //make sure the watcher detects the change
+ $rootView->file_put_contents('foo.txt', 'asd');
+ $cachedData = $rootView->getFileInfo('foo.txt');
+ $this->assertGreaterThanOrEqual($cachedData['mtime'], $oldCachedData['mtime']);
+ $this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
+ }
+
/**
* @param bool $scan
* @return \OC\Files\Storage\Storage
*/
- private function getTestStorage($scan = true) {
- $storage = new \OC\Files\Storage\Temporary(array());
+ private function getTestStorage($scan = true, $class = '\OC\Files\Storage\Temporary') {
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ $storage = new $class(array());
$textData = "dummy file data\n";
$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
$storage->mkdir('folder');
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..f48dc53c5635d1ae1cdf5ca36edcef96c5cfd09a
--- /dev/null
+++ b/tests/lib/hooks/basicemitter.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+
+/**
+ * Class DummyEmitter
+ *
+ * class to make BasicEmitter::emit publicly available
+ *
+ * @package Test\Hooks
+ */
+class DummyEmitter extends \OC\Hooks\BasicEmitter {
+ public function emitEvent($scope, $method, $arguments = array()) {
+ $this->emit($scope, $method, $arguments);
+ }
+}
+
+/**
+ * Class EmittedException
+ *
+ * a dummy exception so we can check if an event is emitted
+ *
+ * @package Test\Hooks
+ */
+class EmittedException extends \Exception {
+}
+
+class BasicEmitter extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var \OC\Hooks\Emitter $emitter
+ */
+ protected $emitter;
+
+ public function setUp() {
+ $this->emitter = new DummyEmitter();
+ }
+
+ public function nonStaticCallBack() {
+ throw new EmittedException;
+ }
+
+ public static function staticCallBack() {
+ throw new EmittedException;
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testAnonymousFunction() {
+ $this->emitter->listen('Test', 'test', function () {
+ throw new EmittedException;
+ });
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testStaticCallback() {
+ $this->emitter->listen('Test', 'test', array('\Test\Hooks\BasicEmitter', 'staticCallBack'));
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testNonStaticCallback() {
+ $this->emitter->listen('Test', 'test', array($this, 'nonStaticCallBack'));
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ public function testOnlyCallOnce() {
+ $count = 0;
+ $listener = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->assertEquals(1, $count, 'Listener called an invalid number of times (' . $count . ') expected 1');
+ }
+
+ public function testDifferentMethods() {
+ $count = 0;
+ $listener = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Test', 'foo');
+ $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+ }
+
+ public function testDifferentScopes() {
+ $count = 0;
+ $listener = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Bar', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Bar', 'test');
+ $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+ }
+
+ public function testDifferentCallbacks() {
+ $count = 0;
+ $listener1 = function () use (&$count) {
+ $count++;
+ };
+ $listener2 = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener1);
+ $this->emitter->listen('Test', 'test', $listener2);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testArguments() {
+ $this->emitter->listen('Test', 'test', function ($foo, $bar) {
+ if ($foo == 'foo' and $bar == 'bar') {
+ throw new EmittedException;
+ }
+ });
+ $this->emitter->emitEvent('Test', 'test', array('foo', 'bar'));
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testNamedArguments() {
+ $this->emitter->listen('Test', 'test', function ($foo, $bar) {
+ if ($foo == 'foo' and $bar == 'bar') {
+ throw new EmittedException;
+ }
+ });
+ $this->emitter->emitEvent('Test', 'test', array('foo' => 'foo', 'bar' => 'bar'));
+ }
+
+ public function testRemoveAllSpecified() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->removeListener('Test', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ public function testRemoveWildcardListener() {
+ $listener1 = function () {
+ throw new EmittedException;
+ };
+ $listener2 = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener1);
+ $this->emitter->listen('Test', 'test', $listener2);
+ $this->emitter->removeListener('Test', 'test');
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ public function testRemoveWildcardMethod() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->removeListener('Test', null, $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Test', 'foo');
+ }
+
+ public function testRemoveWildcardScope() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Bar', 'test', $listener);
+ $this->emitter->removeListener(null, 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Bar', 'test');
+ }
+
+ public function testRemoveWildcardScopeAndMethod() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->listen('Bar', 'foo', $listener);
+ $this->emitter->removeListener(null, null, $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Test', 'foo');
+ $this->emitter->emitEvent('Bar', 'foo');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveKeepOtherCallback() {
+ $listener1 = function () {
+ throw new EmittedException;
+ };
+ $listener2 = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener1);
+ $this->emitter->listen('Test', 'test', $listener2);
+ $this->emitter->removeListener('Test', 'test', $listener1);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveKeepOtherMethod() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->removeListener('Test', 'foo', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveKeepOtherScope() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Bar', 'test', $listener);
+ $this->emitter->removeListener('Bar', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveNonExistingName() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->removeListener('Bar', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+}
diff --git a/tests/lib/hooks/legacyemitter.php b/tests/lib/hooks/legacyemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7bed879a722959414bee8752688ceb0f0fcfeda
--- /dev/null
+++ b/tests/lib/hooks/legacyemitter.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+
+/**
+ * Class DummyLegacyEmitter
+ *
+ * class to make LegacyEmitter::emit publicly available
+ *
+ * @package Test\Hooks
+ */
+class DummyLegacyEmitter extends \OC\Hooks\LegacyEmitter {
+ public function emitEvent($scope, $method, $arguments = array()) {
+ $this->emit($scope, $method, $arguments);
+ }
+}
+
+class LegacyEmitter extends BasicEmitter {
+
+ //we can't use exceptions here since OC_Hooks catches all exceptions
+ private static $emitted = false;
+
+ public function setUp() {
+ $this->emitter = new DummyLegacyEmitter();
+ self::$emitted = false;
+ \OC_Hook::clear('Test','test');
+ }
+
+ public static function staticLegacyCallBack() {
+ self::$emitted = true;
+ }
+
+ public static function staticLegacyArgumentsCallBack($arguments) {
+ if ($arguments['foo'] == 'foo' and $arguments['bar'] == 'bar')
+ self::$emitted = true;
+ }
+
+ public function testLegacyHook() {
+ \OC_Hook::connect('Test', 'test', '\Test\Hooks\LegacyEmitter', 'staticLegacyCallBack');
+ $this->emitter->emitEvent('Test', 'test');
+ $this->assertEquals(true, self::$emitted);
+ }
+
+ public function testLegacyArguments() {
+ \OC_Hook::connect('Test', 'test', '\Test\Hooks\LegacyEmitter', 'staticLegacyArgumentsCallBack');
+ $this->emitter->emitEvent('Test', 'test', array('foo' => 'foo', 'bar' => 'bar'));
+ $this->assertEquals(true, self::$emitted);
+ }
+}
diff --git a/tests/lib/session/memory.php b/tests/lib/session/memory.php
new file mode 100644
index 0000000000000000000000000000000000000000..2dc236b73bfa0db751cd241692f0fdfe004b8104
--- /dev/null
+++ b/tests/lib/session/memory.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Session;
+
+class Memory extends Session {
+ public function setUp() {
+ $this->instance = new \OC\Session\Memory(uniqid());
+ }
+}
diff --git a/tests/lib/session/session.php b/tests/lib/session/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..72dee44e7cb14e4b35f096fba62428c612d52766
--- /dev/null
+++ b/tests/lib/session/session.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Session;
+
+abstract class Session extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var \OC\Session\Session
+ */
+ protected $instance;
+
+ public function tearDown() {
+ $this->instance->clear();
+ }
+
+ public function testNotExistsEmpty() {
+ $this->assertFalse($this->instance->exists('foo'));
+ }
+
+ public function testExistsAfterSet() {
+ $this->instance->set('foo', 1);
+ $this->assertTrue($this->instance->exists('foo'));
+ }
+
+ public function testNotExistsAfterRemove() {
+ $this->instance->set('foo', 1);
+ $this->instance->remove('foo');
+ $this->assertFalse($this->instance->exists('foo'));
+ }
+
+ public function testGetNonExisting() {
+ $this->assertNull($this->instance->get('foo'));
+ }
+
+ public function testGetAfterSet() {
+ $this->instance->set('foo', 'bar');
+ $this->assertEquals('bar', $this->instance->get(('foo')));
+ }
+
+ public function testRemoveNonExisting() {
+ $this->instance->remove('foo');
+ }
+
+ public function testNotExistsAfterClear() {
+ $this->instance->set('foo', 1);
+ $this->instance->clear();
+ $this->assertFalse($this->instance->exists('foo'));
+ }
+
+ public function testArrayInterface() {
+ $this->assertFalse(isset($this->instance['foo']));
+ $this->instance['foo'] = 'bar';
+ $this->assertTrue(isset($this->instance['foo']));
+ $this->assertEquals('bar', $this->instance['foo']);
+ unset($this->instance['foo']);
+ $this->assertFalse(isset($this->instance['foo']));
+ }
+}
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc49f6db4b281e3c58b2d9051c923c06a04f1d30
--- /dev/null
+++ b/tests/lib/user/manager.php
@@ -0,0 +1,304 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\User;
+
+class Manager extends \PHPUnit_Framework_TestCase {
+ public function testUserExistsSingleBackendExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(true));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $this->assertTrue($manager->userExists('foo'));
+ }
+
+ public function testUserExistsSingleBackendNotExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(false));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $this->assertFalse($manager->userExists('foo'));
+ }
+
+ public function testUserExistsNoBackends() {
+ $manager = new \OC\User\Manager();
+
+ $this->assertFalse($manager->userExists('foo'));
+ }
+
+ public function testUserExistsTwoBackendsSecondExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ */
+ $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(false));
+
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ */
+ $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(true));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend1);
+ $manager->registerBackend($backend2);
+
+ $this->assertTrue($manager->userExists('foo'));
+ }
+
+ public function testUserExistsTwoBackendsFirstExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ */
+ $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(true));
+
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ */
+ $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2->expects($this->never())
+ ->method('userExists');
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend1);
+ $manager->registerBackend($backend2);
+
+ $this->assertTrue($manager->userExists('foo'));
+ }
+
+ public function testGetOneBackendExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(true));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $this->assertEquals('foo', $manager->get('foo')->getUID());
+ }
+
+ public function testGetOneBackendNotExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(false));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $this->assertEquals(null, $manager->get('foo'));
+ }
+
+ public function testSearchOneBackend() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('getUsers')
+ ->with($this->equalTo('fo'))
+ ->will($this->returnValue(array('foo', 'afoo')));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $result = $manager->search('fo');
+ $this->assertEquals(2, count($result));
+ $this->assertEquals('afoo', $result[0]->getUID());
+ $this->assertEquals('foo', $result[1]->getUID());
+ }
+
+ public function testSearchTwoBackendLimitOffset() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ */
+ $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1->expects($this->once())
+ ->method('getUsers')
+ ->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
+ ->will($this->returnValue(array('foo1', 'foo2')));
+
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ */
+ $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2->expects($this->once())
+ ->method('getUsers')
+ ->with($this->equalTo('fo'), $this->equalTo(1), $this->equalTo(0))
+ ->will($this->returnValue(array('foo3')));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend1);
+ $manager->registerBackend($backend2);
+
+ $result = $manager->search('fo', 3, 1);
+ $this->assertEquals(3, count($result));
+ $this->assertEquals('foo1', $result[0]->getUID());
+ $this->assertEquals('foo2', $result[1]->getUID());
+ $this->assertEquals('foo3', $result[2]->getUID());
+ }
+
+ public function testCreateUserSingleBackendNotExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(true));
+
+ $backend->expects($this->once())
+ ->method('createUser')
+ ->with($this->equalTo('foo'), $this->equalTo('bar'));
+
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(false));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $user = $manager->createUser('foo', 'bar');
+ $this->assertEquals('foo', $user->getUID());
+ }
+
+ /**
+ * @expectedException \Exception
+ */
+ public function testCreateUserSingleBackendExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(true));
+
+ $backend->expects($this->never())
+ ->method('createUser');
+
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(true));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $manager->createUser('foo', 'bar');
+ }
+
+ public function testCreateUserSingleBackendNotSupported() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $backend->expects($this->never())
+ ->method('createUser');
+
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(false));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $this->assertFalse($manager->createUser('foo', 'bar'));
+ }
+
+ public function testCreateUserNoBackends() {
+ $manager = new \OC\User\Manager();
+
+ $this->assertFalse($manager->createUser('foo', 'bar'));
+ }
+
+ /**
+ * @expectedException \Exception
+ */
+ public function testCreateUserTwoBackendExists() {
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ */
+ $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(true));
+
+ $backend1->expects($this->never())
+ ->method('createUser');
+
+ $backend1->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(false));
+
+ /**
+ * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ */
+ $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(true));
+
+ $backend2->expects($this->never())
+ ->method('createUser');
+
+ $backend2->expects($this->once())
+ ->method('userExists')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue(true));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend1);
+ $manager->registerBackend($backend2);
+
+ $manager->createUser('foo', 'bar');
+ }
+}
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..274e9e2831eea8bce10721625458fb5d9f85a442
--- /dev/null
+++ b/tests/lib/user/session.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\User;
+
+class Session extends \PHPUnit_Framework_TestCase {
+ public function testGetUser() {
+ $session = $this->getMock('\OC\Session\Memory', array(), array(''));
+ $session->expects($this->once())
+ ->method('get')
+ ->with('user_id')
+ ->will($this->returnValue('foo'));
+
+ $backend = $this->getMock('OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('userExists')
+ ->with('foo')
+ ->will($this->returnValue(true));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $userSession = new \OC\User\Session($manager, $session);
+ $user = $userSession->getUser();
+ $this->assertEquals('foo', $user->getUID());
+ }
+
+ public function testSetUser() {
+ $session = $this->getMock('\OC\Session\Memory', array(), array(''));
+ $session->expects($this->once())
+ ->method('set')
+ ->with('user_id', 'foo');
+
+ $manager = $this->getMock('\OC\User\Manager');
+
+ $backend = $this->getMock('OC_User_Dummy');
+
+ $user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+ $user->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('foo'));
+
+ $userSession = new \OC\User\Session($manager, $session);
+ $userSession->setUser($user);
+ }
+
+ public function testLoginValidPasswordEnabled() {
+ $session = $this->getMock('\OC\Session\Memory', array(), array(''));
+ $session->expects($this->once())
+ ->method('set')
+ ->with('user_id', 'foo');
+
+ $manager = $this->getMock('\OC\User\Manager');
+
+ $backend = $this->getMock('OC_User_Dummy');
+
+ $user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+ $user->expects($this->once())
+ ->method('checkPassword')
+ ->with('bar')
+ ->will($this->returnValue(true));
+ $user->expects($this->once())
+ ->method('isEnabled')
+ ->will($this->returnValue(true));
+ $user->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('foo'));
+
+ $manager->expects($this->once())
+ ->method('get')
+ ->with('foo')
+ ->will($this->returnValue($user));
+
+ $userSession = new \OC\User\Session($manager, $session);
+ $userSession->login('foo', 'bar');
+ $this->assertEquals($user, $userSession->getUser());
+ }
+
+ public function testLoginValidPasswordDisabled() {
+ $session = $this->getMock('\OC\Session\Memory', array(), array(''));
+ $session->expects($this->never())
+ ->method('set');
+
+ $manager = $this->getMock('\OC\User\Manager');
+
+ $backend = $this->getMock('OC_User_Dummy');
+
+ $user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+ $user->expects($this->once())
+ ->method('checkPassword')
+ ->with('bar')
+ ->will($this->returnValue(true));
+ $user->expects($this->once())
+ ->method('isEnabled')
+ ->will($this->returnValue(false));
+
+ $manager->expects($this->once())
+ ->method('get')
+ ->with('foo')
+ ->will($this->returnValue($user));
+
+ $userSession = new \OC\User\Session($manager, $session);
+ $userSession->login('foo', 'bar');
+ }
+
+ public function testLoginInValidPassword() {
+ $session = $this->getMock('\OC\Session\Memory', array(), array(''));
+ $session->expects($this->never())
+ ->method('set');
+
+ $manager = $this->getMock('\OC\User\Manager');
+
+ $backend = $this->getMock('OC_User_Dummy');
+
+ $user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+ $user->expects($this->once())
+ ->method('checkPassword')
+ ->with('bar')
+ ->will($this->returnValue(false));
+ $user->expects($this->never())
+ ->method('isEnabled');
+
+ $manager->expects($this->once())
+ ->method('get')
+ ->with('foo')
+ ->will($this->returnValue($user));
+
+ $userSession = new \OC\User\Session($manager, $session);
+ $userSession->login('foo', 'bar');
+ }
+
+ public function testLoginNonExisting() {
+ $session = $this->getMock('\OC\Session\Memory', array(), array(''));
+ $session->expects($this->never())
+ ->method('set');
+
+ $manager = $this->getMock('\OC\User\Manager');
+
+ $backend = $this->getMock('OC_User_Dummy');
+
+ $manager->expects($this->once())
+ ->method('get')
+ ->with('foo')
+ ->will($this->returnValue(null));
+
+ $userSession = new \OC\User\Session($manager, $session);
+ $userSession->login('foo', 'bar');
+ }
+}
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0d170cbfc56db3016e1859084d1dd8f6c64cdae
--- /dev/null
+++ b/tests/lib/user/user.php
@@ -0,0 +1,364 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\User;
+
+use OC\Hooks\PublicEmitter;
+
+class User extends \PHPUnit_Framework_TestCase {
+ public function testDisplayName() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Backend');
+ $backend->expects($this->once())
+ ->method('getDisplayName')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue('Foo'));
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME))
+ ->will($this->returnValue(true));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertEquals('Foo', $user->getDisplayName());
+ }
+
+ public function testDisplayNameNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Backend');
+ $backend->expects($this->never())
+ ->method('getDisplayName');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME))
+ ->will($this->returnValue(false));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertEquals('foo', $user->getDisplayName());
+ }
+
+ public function testSetPassword() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('setPassword')
+ ->with($this->equalTo('foo'), $this->equalTo('bar'));
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_SET_PASSWORD) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertTrue($user->setPassword('bar',''));
+ }
+
+ public function testSetPasswordNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->never())
+ ->method('setPassword');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertFalse($user->setPassword('bar',''));
+ }
+
+ public function testDelete() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('deleteUser')
+ ->with($this->equalTo('foo'));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertTrue($user->delete());
+ }
+
+ public function testCheckPassword() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('checkPassword')
+ ->with($this->equalTo('foo'), $this->equalTo('bar'))
+ ->will($this->returnValue(true));
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertTrue($user->checkPassword('bar'));
+ }
+
+ public function testCheckPasswordNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->never())
+ ->method('checkPassword');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertFalse($user->checkPassword('bar'));
+ }
+
+ public function testGetHome() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('getHome')
+ ->with($this->equalTo('foo'))
+ ->will($this->returnValue('/home/foo'));
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_GET_HOME) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertEquals('/home/foo', $user->getHome());
+ }
+
+ public function testGetHomeNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->never())
+ ->method('getHome');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertEquals(\OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/foo', $user->getHome());
+ }
+
+ public function testCanChangePassword() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_SET_PASSWORD) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertTrue($user->canChangePassword());
+ }
+
+ public function testCanChangePasswordNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertFalse($user->canChangePassword());
+ }
+
+ public function testCanChangeDisplayName() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertTrue($user->canChangeDisplayName());
+ }
+
+ public function testCanChangeDisplayNameNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertFalse($user->canChangeDisplayName());
+ }
+
+ public function testSetDisplayNameSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Database');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $backend->expects($this->once())
+ ->method('setDisplayName')
+ ->with('foo','Foo');
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertTrue($user->setDisplayName('Foo'));
+ $this->assertEquals('Foo',$user->getDisplayName());
+ }
+
+ public function testSetDisplayNameNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Database');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ return false;
+ }));
+
+ $backend->expects($this->never())
+ ->method('setDisplayName');
+
+ $user = new \OC\User\User('foo', $backend);
+ $this->assertFalse($user->setDisplayName('Foo'));
+ $this->assertEquals('foo',$user->getDisplayName());
+ }
+
+ public function testSetPasswordHooks() {
+ $hooksCalled = 0;
+ $test = $this;
+
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('setPassword');
+
+ /**
+ * @param \OC\User\User $user
+ * @param string $password
+ */
+ $hook = function ($user, $password) use ($test, &$hooksCalled) {
+ $hooksCalled++;
+ $test->assertEquals('foo', $user->getUID());
+ $test->assertEquals('bar', $password);
+ };
+
+ $emitter = new PublicEmitter();
+ $emitter->listen('\OC\User', 'preSetPassword', $hook);
+ $emitter->listen('\OC\User', 'postSetPassword', $hook);
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_SET_PASSWORD) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = new \OC\User\User('foo', $backend, $emitter);
+
+ $user->setPassword('bar','');
+ $this->assertEquals(2, $hooksCalled);
+ }
+
+ public function testDeleteHooks() {
+ $hooksCalled = 0;
+ $test = $this;
+
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('deleteUser');
+
+ /**
+ * @param \OC\User\User $user
+ */
+ $hook = function ($user) use ($test, &$hooksCalled) {
+ $hooksCalled++;
+ $test->assertEquals('foo', $user->getUID());
+ };
+
+ $emitter = new PublicEmitter();
+ $emitter->listen('\OC\User', 'preDelete', $hook);
+ $emitter->listen('\OC\User', 'postDelete', $hook);
+
+ $user = new \OC\User\User('foo', $backend, $emitter);
+ $this->assertTrue($user->delete());
+ $this->assertEquals(2, $hooksCalled);
+ }
+}
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index e79dd49870c89f33b5ef1f309b5a5cc41c5d4233..df5f600f20da3a479daacea277dbb8fe953498f9 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -81,6 +81,17 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
}
+ public function testrenameCategory() {
+ $defcategories = array('Friends', 'Family', 'Wrok', 'Other');
+ $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
+
+ $this->assertTrue($catmgr->rename('Wrok', 'Work'));
+ $this->assertTrue($catmgr->hasCategory('Work'));
+ $this->assertFalse($catmgr->hasCategory('Wrok'));
+ $this->assertFalse($catmgr->rename('Wrok', 'Work'));
+
+ }
+
public function testAddToCategory() {
$objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 23cd123edc67cabcf26882e400aca784144fd37d..577e1f0d490c2918842bfedb3743a85443e47713 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -5,10 +5,23 @@
<file>apps.php</file>
</testsuite>
<!-- filters for code coverage -->
- <whitelist processUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">..</directory>
- <exclude>
- <directory suffix=".php">../3rdparty</directory>
- </exclude>
- </whitelist>
+ <filter>
+ <!-- whitelist processUncoveredFilesFromWhitelist="true" -->
+ <whitelist>
+ <directory suffix=".php">..</directory>
+ <exclude>
+ <directory suffix=".php">../3rdparty</directory>
+ <directory suffix=".php">../apps/files/l10n</directory>
+ <directory suffix=".php">../apps/files_external/l10n</directory>
+ <directory suffix=".php">../apps/files_versions/l10n</directory>
+ <directory suffix=".php">../apps/files_encryption/l10n</directory>
+ <directory suffix=".php">../apps/files_sharing/l10n</directory>
+ <directory suffix=".php">../apps/files_trashbin/l10n</directory>
+ <directory suffix=".php">../apps/user_ldap/l10n</directory>
+ <directory suffix=".php">../apps/user_webdavauth/l10n</directory>
+ <directory suffix=".php">../lib/MDB2</directory>
+ </exclude>
+ </whitelist>
+ </filter>
</phpunit>
+
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index f5a686c3020688512d2dc84bd0094088f472c2ad..510c38a3c8bf3bfcf5f87c52b52ce34465df655d 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -5,12 +5,16 @@
<file>apps.php</file>
</testsuite>
<!-- filters for code coverage -->
- <whitelist processUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">..</directory>
- <exclude>
- <directory suffix=".php">../3rdparty</directory>
- </exclude>
- </whitelist>
+ <filter>
+ <!-- whitelist processUncoveredFilesFromWhitelist="true" -->
+ <whitelist>
+ <directory suffix=".php">..</directory>
+ <exclude>
+ <directory suffix=".php">../3rdparty</directory>
+ <directory suffix=".php">../lib/MDB2</directory>
+ </exclude>
+ </whitelist>
+ </filter>
<listeners>
<listener class="PHPUnit_Util_Log_JSON"></listener>
</listeners>