diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
| commit | 5445b94416f50bb040e7426cadfa458607893f07 (patch) | |
| tree | 337b12362333030e0ebda37acb7f25073723a7af | |
| parent | 7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff) | |
| parent | 1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff) | |
| download | nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip | |
merge master into filesystem
183 files changed, 2341 insertions, 1516 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 0c130efe472..f5948fd15ea 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -23,7 +23,7 @@ #new>ul>li>p { cursor:pointer; } #new>ul>li>form>input { padding:0.3em; margin:-0.3em; } -#upload { +#upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; } #upload a { @@ -35,7 +35,7 @@ } .file_upload_target { display:none; } .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; } -#file_upload_start { +#file_upload_start { left:0; top:0; width:28px; height:27px; padding:0; font-size:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 80b9c01f838..f5ee363a4c8 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -70,23 +70,23 @@ var FileActions = { } parent.children('a.name').append('<span class="fileactions" />'); var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions()); - + var actionHandler = function (event) { event.stopPropagation(); event.preventDefault(); FileActions.currentFile = event.data.elem; var file = FileActions.getCurrentFile(); - + event.data.actionFunc(file); }; - + $.each(actions, function (name, action) { // NOTE: Temporary fix to prevent rename action in root of Shared directory if (name === 'Rename' && $('#dir').val() === '/Shared') { return true; } - + if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') { var img = FileActions.icons[name]; if (img.call) { @@ -97,16 +97,16 @@ var FileActions = { html += '<img class ="svg" src="' + img + '" /> '; } html += t('files', name) + '</a>'; - + var element = $(html); element.data('action', name); //alert(element); element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler); parent.find('a.name>span.fileactions').append(element); } - + }); - + if (actions['Delete']) { var img = FileActions.icons['Delete']; if (img.call) { diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 4afe4ebe659..f560e908456 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -52,7 +52,7 @@ Files={ } }; $(document).ready(function() { - Files.bindKeyboardShortcuts(document, jQuery); + Files.bindKeyboardShortcuts(document, jQuery); $('#fileList tr').each(function(){ //little hack to set unescape filenames in attribute $(this).attr('data-file',decodeURIComponent($(this).attr('data-file'))); diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 77219abcf20..48c4ac74c2b 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -1,4 +1,7 @@ <?php $TRANSLATIONS = array( +"Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam", +"Could not move %s" => "Kon %s niet verplaatsen", +"Unable to rename file" => "Kan bestand niet hernoemen", "No file was uploaded. Unknown error" => "Er was geen bestand geladen. Onbekende fout", "There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:", @@ -35,6 +38,7 @@ "Upload cancelled." => "Uploaden geannuleerd.", "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "URL cannot be empty." => "URL kan niet leeg zijn.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud", "{count} files scanned" => "{count} bestanden gescanned", "error while scanning" => "Fout tijdens het scannen", "Name" => "Naam", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index b96048cf002..226dae896c2 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -1,4 +1,7 @@ <?php $TRANSLATIONS = array( +"Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje", +"Could not move %s" => "Nie można było przenieść %s", +"Unable to rename file" => "Nie można zmienić nazwy pliku", "No file was uploaded. Unknown error" => "Plik nie został załadowany. Nieznany błąd", "There is no error, the file uploaded with success" => "Przesłano plik", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ", diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php index 268b1a80ccd..61bfe849c72 100644 --- a/apps/files_encryption/templates/settings.php +++ b/apps/files_encryption/templates/settings.php @@ -2,7 +2,7 @@ <fieldset class="personalblock"> <legend><strong><?php echo $l->t('Encryption');?></strong></legend> <input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?> - id='enable_encryption' ></input> + id='enable_encryption' /> <label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br /> <select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple"> <?php foreach ($_['blacklist'] as $type): ?> diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 3bb512493d8..6b0df21461b 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -103,7 +103,7 @@ class OC_Mount_Config { 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', - 'secure' => '!Secure https://')); + 'secure' => '!Secure https://')); return($backends); } @@ -374,7 +374,7 @@ class OC_Mount_Config { } /** - * check if smbclient is installed + * check if smbclient is installed */ public static function checksmbclient() { if(function_exists('shell_exec')) { @@ -386,7 +386,7 @@ class OC_Mount_Config { } /** - * check if php-ftp is installed + * check if php-ftp is installed */ public static function checkphpftp() { if(function_exists('ftp_login')) { diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index dd537d779a6..78ca1c87fee 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -1,7 +1,7 @@ <form id="files_external"> <fieldset class="personalblock"> <legend><strong><?php echo $l->t('External Storage'); ?></strong></legend> - <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?> + <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?> <table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'> <thead> <tr> @@ -47,7 +47,7 @@ <?php elseif (strpos($placeholder, '!') !== false): ?> <label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" - <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> + <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> /><?php echo substr($placeholder, 1); ?></label> <?php elseif (strpos($placeholder, '&') !== false): ?> <input type="text" @@ -105,7 +105,7 @@ <?php endif; ?> <td <?php if ($mountPoint != ''): ?>class="remove" <?php else: ?>style="visibility:hidden;" - <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>" + <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td> diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 8a546d62163..a46d0179801 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,7 +1,7 @@ $(document).ready(function() { if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) { - + FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { if ($('#dir').val() == '/') { var item = $('#dir').val() + filename; diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 10442553e31..f85fe92ff60 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -71,7 +71,7 @@ if (isset($_GET['t'])) { $fileSource = $linkItem['file_source']; $shareOwner = $linkItem['uid_owner']; - if (OCP\User::userExists($shareOwner) && $fileSource != -1) { + if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) { $pathAndUser = getPathAndUser($linkItem['file_source']); $fileOwner = $pathAndUser['user']; @@ -167,7 +167,7 @@ if ($linkItem) { $tmpl->printPage(); exit(); } - + } else { // Check if item id is set in session if (!isset($_SESSION['public_link_authenticated']) diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index 6e27f43d576..6071240e583 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -28,7 +28,6 @@ $tmpl = new OCP\Template( 'files_versions', 'history', 'user' ); if ( isset( $_GET['path'] ) ) { $path = $_GET['path']; - $path = $path; $tmpl->assign( 'path', $path ); $versions = new OCA_Versions\Storage(); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index eb0343bf608..003d548d2b2 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -79,6 +79,7 @@ class Storage { // create all parent folders $info=pathinfo($filename); + $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$users_view->getAbsolutePath('files_versions/'); if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true); } @@ -128,6 +129,7 @@ class Storage { list($uidn, $newpath) = self::getUidAndFilename($newpath); $versions_view = new \OC_FilesystemView('/'.$uid .'/files_versions'); $files_view = new \OC_FilesystemView('/'.$uid .'/files'); + $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath; if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->rename($oldpath, $newpath); @@ -148,8 +150,9 @@ class Storage { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { list($uid, $filename) = self::getUidAndFilename($filename); - $users_view = new \OC\Files\View('/' . \OCP\User::getUser()); - + $users_view = new \OC\Files\View('/'.$uid); + $versionCreated = false; + //first create a new version $version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename); if ( !$users_view->file_exists($version)) { diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php index 88063cb075b..bfca8366f5d 100644 --- a/apps/files_versions/templates/settings.php +++ b/apps/files_versions/templates/settings.php @@ -1,6 +1,6 @@ <form id="versionssettings"> - <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Files Versioning');?></strong></legend> - <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/> - </fieldset> + <fieldset class="personalblock"> + <legend><strong><?php echo $l->t('Files Versioning');?></strong></legend> + <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/> + </fieldset> </form> diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php index d801ddff631..c11eb5bdc51 100644 --- a/apps/user_ldap/l10n/ca.php +++ b/apps/user_ldap/l10n/ca.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.", "Host" => "Màquina", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://", "Base DN" => "DN Base", diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index 0c14ebb9d1e..9b307e54dd4 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<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.", "Host" => "Počítač", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://", "Base DN" => "Základní DN", diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 87579cb2431..89bda8af97f 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.", "Host" => "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://", "Base DN" => "Basis-DN", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index f986ae83e87..82877b5ca1b 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.", "Host" => "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://", "Base DN" => "Basis-DN", diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php index 8c421cf162b..1f75a687a5d 100644 --- a/apps/user_ldap/l10n/el.php +++ b/apps/user_ldap/l10n/el.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει.", "Host" => "Διακομιστής", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://", "Base DN" => "Base DN", diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php index 4931af79eaf..48e7b24734e 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo.", "Host" => "Servidor", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://", "Base DN" => "DN base", diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php index 0b1340d4397..331bf8699f4 100644 --- a/apps/user_ldap/l10n/es_AR.php +++ b/apps/user_ldap/l10n/es_AR.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo.", "Host" => "Servidor", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://", "Base DN" => "DN base", diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php index 06ca9cb294e..7290dabbef0 100644 --- a/apps/user_ldap/l10n/eu.php +++ b/apps/user_ldap/l10n/eu.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.", "Host" => "Hostalaria", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://", "Base DN" => "Oinarrizko DN", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index 9750d1352a8..dd2fb08091c 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe.", "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", diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php index ae05efcd27f..d60521c4a02 100644 --- a/apps/user_ldap/l10n/gl.php +++ b/apps/user_ldap/l10n/gl.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP é necesario e non está instalado, a infraestrutura non funcionará. Consulte co administrador do sistema para instalalo.", "Host" => "Servidor", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://", "Base DN" => "DN base", diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php index 577afcef1c9..aae29d057ed 100644 --- a/apps/user_ldap/l10n/hu_HU.php +++ b/apps/user_ldap/l10n/hu_HU.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelem:</b> a szükséges PHP LDAP modul nincs telepítve. Enélkül az LDAP azonosítás nem fog működni. Kérje meg a rendszergazdát, hogy telepítse a szükséges modult!", "Host" => "Kiszolgáló", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://", "Base DN" => "DN-gyökér", diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index 915ce3af5b8..b09819d79ee 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.", "Host" => "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://", "Base DN" => "DN base", diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php index c7b2a0f91b8..9dff8e7bd60 100644 --- a/apps/user_ldap/l10n/ja_JP.php +++ b/apps/user_ldap/l10n/ja_JP.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs 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", diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php index 37ac3d1bda5..c0d09b5c3c1 100644 --- a/apps/user_ldap/l10n/ko.php +++ b/apps/user_ldap/l10n/ko.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs 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을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.", "Base DN" => "기본 DN", diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php index 23e9a15c010..5e2ddf89592 100644 --- a/apps/user_ldap/l10n/nl.php +++ b/apps/user_ldap/l10n/nl.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren.", "Host" => "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://", "Base DN" => "Basis DN", diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php index 0a3dea14c94..55110b8a830 100644 --- a/apps/user_ldap/l10n/pl.php +++ b/apps/user_ldap/l10n/pl.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.", "Host" => "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://", "Base DN" => "Baza DN", diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index 1b21b899a2e..1640f037498 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>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.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar.", "Host" => "Anfitrião", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://", "Base DN" => "DN base", diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php index b4d7d4902fe..3ab336cfffb 100644 --- a/apps/user_ldap/l10n/ro.php +++ b/apps/user_ldap/l10n/ro.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia", "Host" => "Gazdă", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://", "Base DN" => "DN de bază", diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php index f41a0b05838..42fba32f43f 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs 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", diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php index 09d7899249a..64ba1176f6e 100644 --- a/apps/user_ldap/l10n/ru_RU.php +++ b/apps/user_ldap/l10n/ru_RU.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.", "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/sl.php b/apps/user_ldap/l10n/sl.php index 1d1fc33a83b..247f2bfdcbd 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti.", "Host" => "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Base DN" => "Osnovni DN", diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index e8e14af7aca..1e36ff91bab 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.", -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den.", "Host" => "Server", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://", "Base DN" => "Start DN", diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php index f82e9f2a420..d617d939265 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs 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", diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php index cd320b5cf6c..ed5041eff06 100644 --- a/apps/user_ldap/l10n/zh_CN.php +++ b/apps/user_ldap/l10n/zh_CN.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( "<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 needs 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" => "Base DN", diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php index 245a5101341..7ac540f2130 100644 --- a/apps/user_webdavauth/l10n/ca.php +++ b/apps/user_webdavauth/l10n/ca.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "Autenticació WebDAV", +"URL: http://" => "URL: 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 enviarà les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarà els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides." ); diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php index 245a5101341..9bd4c96a2bb 100644 --- a/apps/user_webdavauth/l10n/cs_CZ.php +++ b/apps/user_webdavauth/l10n/cs_CZ.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "Ověření WebDAV", +"URL: http://" => "URL: 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 odešle uživatelské údaje na zadanou URL. Plugin zkontroluje odpověď a považuje návratovou hodnotu HTTP 401 a 403 za neplatné údaje a všechny ostatní hodnoty jako platné přihlašovací údaje." ); diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php index 245a5101341..f893bddc71c 100644 --- a/apps/user_webdavauth/l10n/de.php +++ b/apps/user_webdavauth/l10n/de.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "WebDAV Authentifikation", +"URL: http://" => "URL: 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 wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten." ); diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php index 245a5101341..8f67575fc0f 100644 --- a/apps/user_webdavauth/l10n/de_DE.php +++ b/apps/user_webdavauth/l10n/de_DE.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "WebDAV Authentifizierung", +"URL: http://" => "URL: 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 sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." ); diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php index 245a5101341..951709c4d64 100644 --- a/apps/user_webdavauth/l10n/el.php +++ b/apps/user_webdavauth/l10n/el.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV ", +"URL: http://" => "URL: 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 θα στείλει τα διαπιστευτήρια χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες." ); diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php index 245a5101341..8dd605d84a1 100644 --- a/apps/user_webdavauth/l10n/it.php +++ b/apps/user_webdavauth/l10n/it.php @@ -1,3 +1,4 @@ <?php $TRANSLATIONS = array( +"WebDAV Authentication" => "Autenticazione WebDAV", "URL: http://" => "URL: http://" ); diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php index 245a5101341..7d1bb33923e 100644 --- a/apps/user_webdavauth/l10n/nl.php +++ b/apps/user_webdavauth/l10n/nl.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "WebDAV authenticatie", +"URL: http://" => "URL: 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 stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens." ); diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php index 245a5101341..4887e935316 100644 --- a/apps/user_webdavauth/l10n/pl.php +++ b/apps/user_webdavauth/l10n/pl.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "Uwierzytelnienie WebDAV", +"URL: http://" => "URL: 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 wyśle dane uwierzytelniające do tego URL. Ten plugin sprawdza odpowiedź i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidłowe dane uwierzytelniające, a każdy inny kod odpowiedzi jako poprawne dane." ); diff --git a/config/config.sample.php b/config/config.sample.php index 33aafab5484..dafb536fa6f 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -123,12 +123,12 @@ $CONFIG = array( 'path'=> '/var/www/owncloud/apps', 'url' => '/apps', 'writable' => true, - ), - ), - 'user_backends'=>array( - array( - 'class'=>'OC_User_IMAP', - 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX') - ) - ) + ), +), +'user_backends'=>array( + array( + 'class'=>'OC_User_IMAP', + 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX') + ) +) ); diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 8d6afeb204c..751293e1fd5 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -5,7 +5,9 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s", "No category to add?" => "Ei lisättävää luokkaa?", "This category already exists: " => "Tämä luokka on jo olemassa: ", +"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.", "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.", +"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.", "Settings" => "Asetukset", "seconds ago" => "sekuntia sitten", "1 minute ago" => "1 minuutti sitten", @@ -31,6 +33,9 @@ "Error while sharing" => "Virhe jaettaessa", "Error while unsharing" => "Virhe jakoa peruttaessa", "Error while changing permissions" => "Virhe oikeuksia muuttaessa", +"Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta", +"Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta", +"Share with" => "Jaa", "Share with link" => "Jaa linkillä", "Password protect" => "Suojaa salasanalla", "Password" => "Salasana", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 7a5b10ca3e6..286642ace7a 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Používateľ %s zdieľa s Vami súbor", +"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami adresár", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami súbor \"%s\". Môžete si ho stiahnuť tu: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami adresár \"%s\". Môžete si ho stiahnuť tu: %s", "Category type not provided." => "Neposkytnutý kategorický typ.", "No category to add?" => "Žiadna kategória pre pridanie?", "This category already exists: " => "Táto kategória už existuje:", @@ -39,6 +43,8 @@ "Share with link" => "Zdieľať cez odkaz", "Password protect" => "Chrániť heslom", "Password" => "Heslo", +"Email link to person" => "Odoslať odkaz osobe e-mailom", +"Send" => "Odoslať", "Set expiration date" => "Nastaviť dátum expirácie", "Expiration date" => "Dátum expirácie", "Share via email:" => "Zdieľať cez e-mail:", @@ -55,6 +61,8 @@ "Password protected" => "Chránené heslom", "Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu vypršania platnosti", "Error setting expiration date" => "Chyba pri nastavení dátumu vypršania platnosti", +"Sending ..." => "Odosielam ...", +"Email sent" => "Email odoslaný", "ownCloud password reset" => "Obnovenie hesla pre ownCloud", "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}", "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.", @@ -118,5 +126,6 @@ "remember" => "zapamätať", "Log in" => "Prihlásiť sa", "prev" => "späť", -"next" => "ďalej" +"next" => "ďalej", +"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať." ); diff --git a/core/templates/installation.php b/core/templates/installation.php index 3128c4f2e70..03c580c9b0b 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -1,7 +1,7 @@ -<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input> -<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input> -<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input> -<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input> +<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'> +<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'> +<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'> +<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'> <form action="index.php" method="post"> <input type="hidden" name="install" value="true" /> <?php if(count($_['errors']) > 0): ?> diff --git a/core/templates/login.php b/core/templates/login.php index 10093baabf7..43e45997803 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,50 +1,50 @@ <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <form method="post"> - <fieldset> - <?php if (!empty($_['redirect_url'])) { - echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />'; - } ?> - <ul> - <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?> - <li class="errors"> - <?php echo $l->t('Automatic logon rejected!'); ?><br> - <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small> - <br> - <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small> - </li> - <?php endif; ?> - <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> - <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>"> - <li class="errors"> - <?php echo $l->t('Lost your password?'); ?> - </li> - </a> - <?php endif; ?> - </ul> - <p class="infield grouptop"> - <input type="text" name="user" id="user" - value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?> - autocomplete="on" required/> - <label for="user" class="infield"><?php echo $l->t('Username'); ?></label> - <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/> - </p> + <fieldset> + <?php if (!empty($_['redirect_url'])) { + echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />'; + } ?> + <ul> + <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?> + <li class="errors"> + <?php echo $l->t('Automatic logon rejected!'); ?><br> + <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small> + <br> + <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small> + </li> + <?php endif; ?> + <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> + <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>"> + <li class="errors"> + <?php echo $l->t('Lost your password?'); ?> + </li> + </a> + <?php endif; ?> + </ul> + <p class="infield grouptop"> + <input type="text" name="user" id="user" + value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?> + autocomplete="on" required/> + <label for="user" class="infield"><?php echo $l->t('Username'); ?></label> + <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/> + </p> - <p class="infield groupbottom"> - <input type="password" name="password" id="password" value="" - required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> /> - <label for="password" class="infield"><?php echo $l->t('Password'); ?></label> - <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/> - </p> - <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label - for="remember_login"><?php echo $l->t('remember'); ?></label> - <input type="hidden" name="timezone-offset" id="timezone-offset"/> - <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/> - </fieldset> + <p class="infield groupbottom"> + <input type="password" name="password" id="password" value="" + required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> /> + <label for="password" class="infield"><?php echo $l->t('Password'); ?></label> + <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/> + </p> + <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label + for="remember_login"><?php echo $l->t('remember'); ?></label> + <input type="hidden" name="timezone-offset" id="timezone-offset"/> + <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/> + </fieldset> </form> <script> - $(document).ready(function () { - var visitortimezone = (-new Date().getTimezoneOffset() / 60); - $('#timezone-offset').val(visitortimezone); - }); + $(document).ready(function () { + var visitortimezone = (-new Date().getTimezoneOffset() / 60); + $('#timezone-offset').val(visitortimezone); + }); </script> diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po index 7aaa90abe9a..2046f1f1b93 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: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 19:40+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po index e45d6efc2fb..0ec1c50339e 100644 --- a/l10n/bg_BG/user_ldap.po +++ b/l10n/bg_BG/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-01-10 00:04+0100\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po index 75f4261e13f..68b329db2f1 100644 --- a/l10n/bn_BD/user_ldap.po +++ b/l10n/bn_BD/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-01-11 00:05+0100\n" -"PO-Revision-Date: 2013-01-10 10:27+0000\n" -"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "ভিত্তি DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।" @@ -114,10 +118,18 @@ msgstr "পোর্ট" msgid "Base User Tree" msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "গোষ্ঠী-সদস্য সংস্থাপন" diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po index 10b45cc3214..8862120a87a 100644 --- a/l10n/ca/user_ldap.po +++ b/l10n/ca/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: 2012-12-17 00:09+0100\n" -"PO-Revision-Date: 2012-12-16 09:56+0000\n" -"Last-Translator: rogerc <rcalvoi@yahoo.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -27,9 +27,9 @@ msgstr "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompati #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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 necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li." +"<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 msgid "Host" @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "DN Base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Arbre base d'usuaris" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Arbre base de grups" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Associació membres-grup" diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po index f7f1aeb6656..bd7df15438f 100644 --- a/l10n/ca/user_webdavauth.po +++ b/l10n/ca/user_webdavauth.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <rcalvoi@yahoo.com>, 2012. +# <rcalvoi@yahoo.com>, 2012-2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 07:22+0000\n" +"Last-Translator: rogerc <rcalvoi@yahoo.com>\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" @@ -20,7 +20,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Autenticació WebDAV" #: templates/settings.php:4 msgid "URL: http://" @@ -31,4 +31,4 @@ 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 enviarà les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarà els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides." diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 89d650bf77d..fd3f7dcf959 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-16 00:11+0100\n" -"PO-Revision-Date: 2012-12-15 15:30+0000\n" -"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,9 +28,9 @@ msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibi #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "Základní DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -116,10 +120,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Základní uživatelský strom" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Základní skupinový strom" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociace člena skupiny" diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po index aa0a37b0e14..28b3d2f8f19 100644 --- a/l10n/cs_CZ/user_webdavauth.po +++ b/l10n/cs_CZ/user_webdavauth.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012. +# 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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 09:06+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Ověření WebDAV" #: templates/settings.php:4 msgid "URL: http://" @@ -31,4 +31,4 @@ 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 odešle uživatelské údaje na zadanou URL. Plugin zkontroluje odpověď a považuje návratovou hodnotu HTTP 401 a 403 za neplatné údaje a všechny ostatní hodnoty jako platné přihlašovací údaje." diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index 0aab1f40519..a0d0e27bed6 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/user_ldap.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" -"PO-Revision-Date: 2012-12-25 19:52+0000\n" -"Last-Translator: Daraiko <blah@blacksunset.dk>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -31,8 +31,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -49,6 +49,10 @@ msgid "Base DN" msgstr "Base DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -119,10 +123,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Base Bruger Træ" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base Group Tree" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Group-Member association" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 7e83a5b2043..b706cd2fe26 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 14:04+0000\n" -"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,9 +34,9 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren." +"<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 msgid "Host" @@ -52,6 +52,10 @@ msgid "Base DN" msgstr "Basis-DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -122,10 +126,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Basis-Benutzerbaum" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po index 51e570956ce..3bc6180a309 100644 --- a/l10n/de/user_webdavauth.po +++ b/l10n/de/user_webdavauth.po @@ -4,14 +4,15 @@ # # Translators: # <blobbyjj@ymail.com>, 2012. +# <mibunrui@gmx.de>, 2013. # <seeed@freenet.de>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 00:30+0000\n" +"Last-Translator: AndryXY <mibunrui@gmx.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "WebDAV Authentifikation" #: templates/settings.php:4 msgid "URL: http://" @@ -32,4 +33,4 @@ 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 wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten." diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 843b2e80f4d..5bd636b583b 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 14:04+0000\n" -"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,9 +33,9 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren." +"<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 msgid "Host" @@ -51,6 +51,10 @@ msgid "Base DN" msgstr "Basis-DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -121,10 +125,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Basis-Benutzerbaum" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po index bd128d6290f..2d01d1e91e1 100644 --- a/l10n/de_DE/user_webdavauth.po +++ b/l10n/de_DE/user_webdavauth.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <a.tangemann@web.de>, 2012. +# <a.tangemann@web.de>, 2012-2013. # <multimill@gmail.com>, 2012. # <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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 22:23+0000\n" +"Last-Translator: a.tangemann <a.tangemann@web.de>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "WebDAV Authentifizierung" #: templates/settings.php:4 msgid "URL: http://" @@ -33,4 +33,4 @@ 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 sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 14b7e75c710..9edcb771d61 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-28 00:20+0100\n" -"PO-Revision-Date: 2012-12-27 14:12+0000\n" -"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -31,9 +31,9 @@ msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_web #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Προσοχή:</b> Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει." +"<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 msgid "Host" @@ -49,6 +49,10 @@ msgid "Base DN" msgstr "Base DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις" @@ -119,10 +123,18 @@ msgstr "Θύρα" msgid "Base User Tree" msgstr "Base User Tree" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base Group Tree" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Group-Member association" diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po index 6eb63ecca2a..ae9fa402bf8 100644 --- a/l10n/el/user_webdavauth.po +++ b/l10n/el/user_webdavauth.po @@ -6,13 +6,14 @@ # Dimitris M. <monopatis@gmail.com>, 2012. # Efstathios Iosifidis <diamond_gr@freemail.gr>, 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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 08:10+0000\n" +"Last-Translator: Marios Bekatoros <>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Αυθεντικοποίηση μέσω WebDAV " #: templates/settings.php:4 msgid "URL: http://" @@ -33,4 +34,4 @@ 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 θα στείλει τα διαπιστευτήρια χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες." diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po index 419be520bc0..a98b1439507 100644 --- a/l10n/eo/user_ldap.po +++ b/l10n/eo/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "Baz-DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "Pordo" msgid "Base User Tree" msgstr "Baza uzantarbo" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Baza gruparbo" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asocio de grupo kaj membro" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index 32c72e60755..8a1cee622dd 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-19 00:03+0100\n" -"PO-Revision-Date: 2012-12-18 00:58+0000\n" -"Last-Translator: valarauco <manudeloz86@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,9 +32,9 @@ msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibl #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo." +"<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 msgid "Host" @@ -50,6 +50,10 @@ msgid "Base DN" msgstr "DN base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -120,10 +124,18 @@ msgstr "Puerto" msgid "Base User Tree" msgstr "Árbol base de usuario" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Árbol base de grupo" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociación Grupo-Miembro" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 4ceff26caa1..a3b11101f5b 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.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-01-04 13:22+0100\n" -"PO-Revision-Date: 2013-01-04 05:53+0000\n" -"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,9 +28,9 @@ msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibl #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "DN base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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\"" @@ -116,10 +120,18 @@ msgstr "Puerto" msgid "Base User Tree" msgstr "Árbol base de usuario" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Árbol base de grupo" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociación Grupo-Miembro" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index c8207cb0467..f0bcf31f96a 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "Baas DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Baaskasutaja puu" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Baasgrupi puu" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Grupiliikme seotus" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index 6184b2abf9d..aa08719835f 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/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: 2012-12-28 00:20+0100\n" -"PO-Revision-Date: 2012-12-27 20:38+0000\n" -"Last-Translator: asieriko <asieriko@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,9 +27,9 @@ msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak di #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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." +"<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 msgid "Host" @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "Oinarrizko DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan" @@ -115,10 +119,18 @@ msgstr "Portua" msgid "Base User Tree" msgstr "Oinarrizko Erabiltzaile Zuhaitza" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Oinarrizko Talde Zuhaitza" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Talde-Kide elkarketak" diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po index f7e8c607e27..b9a2a147546 100644 --- a/l10n/fa/user_ldap.po +++ b/l10n/fa/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 1541bc9b10d..7aa46f13517 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:03+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 09:13+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" @@ -75,7 +75,7 @@ msgstr "" #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Virhe lisätessä kohdetta %s suosikkeihin." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -84,7 +84,7 @@ msgstr "Luokkia ei valittu poistettavaksi." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Virhe poistaessa kohdetta %s suosikeista." #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" @@ -195,15 +195,15 @@ msgstr "Virhe oikeuksia muuttaessa" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Jaettu kanssasi käyttäjän {owner} toimesta" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "Jaa" #: js/share.js:163 msgid "Share with link" diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po index 6f821f095c1..94f7ad7b4bb 100644 --- a/l10n/fi_FI/user_ldap.po +++ b/l10n/fi_FI/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -29,8 +29,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -47,6 +47,10 @@ msgid "Base DN" msgstr "Oletus DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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ä " @@ -117,10 +121,18 @@ msgstr "Portti" msgid "Base User Tree" msgstr "Oletuskäyttäjäpuu" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Ryhmien juuri" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index d435d3b77ce..c437634e5ed 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-25 00:10+0100\n" -"PO-Revision-Date: 2012-12-24 14:18+0000\n" -"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -32,9 +32,9 @@ msgstr "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe." +"<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 msgid "Host" @@ -50,6 +50,10 @@ msgid "Base DN" msgstr "DN Racine" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé" @@ -120,10 +124,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "DN racine de l'arbre utilisateurs" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "DN racine de l'arbre groupes" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Association groupe-membre" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index 024f611c187..66d3c446382 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.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-01-01 00:04+0100\n" -"PO-Revision-Date: 2012-12-31 08:48+0000\n" -"Last-Translator: mbouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,9 +28,9 @@ msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíb #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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 é necesario e non está instalado, a infraestrutura non funcionará. Consulte co administrador do sistema para instalalo." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "DN base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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»" @@ -116,10 +120,18 @@ msgstr "Porto" msgid "Base User Tree" msgstr "Base da árbore de usuarios" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base da árbore de grupo" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociación de grupos e membros" diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po index 72b23d85881..ec42e5a0854 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-01-12 00:09+0100\n" -"PO-Revision-Date: 2013-01-11 10:25+0000\n" -"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -27,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po index ae9f03b0212..012f8d3f3aa 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po index 5861922d336..e1167276c2b 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/hu/user_ldap.po b/l10n/hu/user_ldap.po index e2abecc29af..2c265cccc0e 100644 --- a/l10n/hu/user_ldap.po +++ b/l10n/hu/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-01-03 00:04+0100\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 3e8274293c3..7f79a7f3275 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/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-01-09 00:04+0100\n" -"PO-Revision-Date: 2013-01-08 16:35+0000\n" -"Last-Translator: gyeben <gyonkibendeguz@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,9 +27,9 @@ msgstr "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompa #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Figyelem:</b> a szükséges PHP LDAP modul nincs telepítve. Enélkül az LDAP azonosítás nem fog működni. Kérje meg a rendszergazdát, hogy telepítse a szükséges modult!" +"<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 msgid "Host" @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "DN-gyökér" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "A felhasználói fa gyökere" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "A csoportfa gyökere" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "A csoporttagság attribútuma" diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po index cae53dce374..769c5692c42 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index 193df390395..d1b6b34abf1 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "port" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index 828b0b2693a..98dfe70c84e 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/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: 2012-12-31 00:04+0100\n" -"PO-Revision-Date: 2012-12-30 19:00+0000\n" -"Last-Translator: sveinn <sveinng@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index 9dc0007050a..1eedd3df93b 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-16 00:11+0100\n" -"PO-Revision-Date: 2012-12-15 10:28+0000\n" -"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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" @@ -28,9 +28,9 @@ msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompat #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "DN base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -116,10 +120,18 @@ msgstr "Porta" msgid "Base User Tree" msgstr "Struttura base dell'utente" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Struttura base del gruppo" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Associazione gruppo-utente " diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po index dd34b4fd51b..9e2b4271325 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. +# 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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-14 23:33+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" @@ -20,7 +20,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Autenticazione WebDAV" #: templates/settings.php:4 msgid "URL: http://" diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po index 39aa1002f7e..d76adc65a82 100644 --- a/l10n/ja_JP/user_ldap.po +++ b/l10n/ja_JP/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-16 00:11+0100\n" -"PO-Revision-Date: 2012-12-15 06:21+0000\n" -"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,9 +29,9 @@ msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性 #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。" +"<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 msgid "Host" @@ -47,6 +47,10 @@ msgid "Base DN" msgstr "ベースDN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "拡張タブでユーザとグループのベースDNを指定することができます。" @@ -117,10 +121,18 @@ msgstr "ポート" msgid "Base User Tree" msgstr "ベースユーザツリー" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "ベースグループツリー" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "グループとメンバーの関連付け" diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po index 0df8aa5b1a4..725d1fd4028 100644 --- a/l10n/ka_GE/user_ldap.po +++ b/l10n/ka_GE/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po index f4012dc7305..53b9f3b081f 100644 --- a/l10n/ko/user_ldap.po +++ b/l10n/ko/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-08 00:30+0100\n" -"PO-Revision-Date: 2013-01-07 09:58+0000\n" -"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,9 +29,9 @@ msgstr "<b>경고</b>user_ldap 앱과 user_webdavauth 앱은 호환되지 않습 #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>경고</b>PHP LDAP 모듈이 설치되지 않았습니다. 백엔드가 동작하지 않을 것 입니다. 시스템관리자에게 요청하여 해당 모듈을 설치하시기 바랍니다." +"<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 msgid "Host" @@ -47,6 +47,10 @@ msgid "Base DN" msgstr "기본 DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다." @@ -117,10 +121,18 @@ msgstr "포트" msgid "Base User Tree" msgstr "기본 사용자 트리" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "기본 그룹 트리" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "그룹-회원 연결" diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po index f4e484f84f7..71ac247ecf1 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po index be1657cb3d3..5f4e6bd5a9a 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index 9891d24f372..0abf2d8c2fd 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "Prievadas" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index b0d8f36bed3..04e36a5cc5a 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po index 3b3498bce1c..4a61e11d5e2 100644 --- a/l10n/mk/user_ldap.po +++ b/l10n/mk/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: 2012-12-29 00:07+0100\n" -"PO-Revision-Date: 2012-12-28 09:25+0000\n" -"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po index 4509f10da64..8d6854379e6 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index b415afa31aa..b7660396ac4 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -27,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index 9471312dac3..69d52caaea3 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-10 00:04+0100\n" -"PO-Revision-Date: 2013-01-09 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 09:54+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" @@ -31,16 +31,16 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "" +msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam" #: ajax/move.php:24 #, php-format msgid "Could not move %s" -msgstr "" +msgstr "Kon %s niet verplaatsen" #: ajax/rename.php:19 msgid "Unable to rename file" -msgstr "" +msgstr "Kan bestand niet hernoemen" #: ajax/upload.php:14 msgid "No file was uploaded. Unknown error" @@ -151,84 +151,84 @@ msgid "" "allowed." msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan." -#: js/files.js:186 +#: js/files.js:187 msgid "generating ZIP-file, it may take some time." msgstr "aanmaken ZIP-file, dit kan enige tijd duren." -#: js/files.js:224 +#: js/files.js:225 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes" -#: js/files.js:224 +#: js/files.js:225 msgid "Upload Error" msgstr "Upload Fout" -#: js/files.js:241 +#: js/files.js:242 msgid "Close" msgstr "Sluit" -#: js/files.js:260 js/files.js:376 js/files.js:409 +#: js/files.js:261 js/files.js:377 js/files.js:410 msgid "Pending" msgstr "Wachten" -#: js/files.js:280 +#: js/files.js:281 msgid "1 file uploading" msgstr "1 bestand wordt ge-upload" -#: js/files.js:283 js/files.js:338 js/files.js:353 +#: js/files.js:284 js/files.js:339 js/files.js:354 msgid "{count} files uploading" msgstr "{count} bestanden aan het uploaden" -#: js/files.js:357 js/files.js:393 +#: js/files.js:358 js/files.js:394 msgid "Upload cancelled." msgstr "Uploaden geannuleerd." -#: js/files.js:464 +#: js/files.js:465 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload." -#: js/files.js:537 +#: js/files.js:538 msgid "URL cannot be empty." msgstr "URL kan niet leeg zijn." -#: js/files.js:543 +#: js/files.js:544 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" -msgstr "" +msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud" -#: js/files.js:727 +#: js/files.js:728 msgid "{count} files scanned" msgstr "{count} bestanden gescanned" -#: js/files.js:735 +#: js/files.js:736 msgid "error while scanning" msgstr "Fout tijdens het scannen" -#: js/files.js:808 templates/index.php:64 +#: js/files.js:809 templates/index.php:64 msgid "Name" msgstr "Naam" -#: js/files.js:809 templates/index.php:75 +#: js/files.js:810 templates/index.php:75 msgid "Size" msgstr "Bestandsgrootte" -#: js/files.js:810 templates/index.php:77 +#: js/files.js:811 templates/index.php:77 msgid "Modified" msgstr "Laatst aangepast" -#: js/files.js:829 +#: js/files.js:830 msgid "1 folder" msgstr "1 map" -#: js/files.js:831 +#: js/files.js:832 msgid "{count} folders" msgstr "{count} mappen" -#: js/files.js:839 +#: js/files.js:840 msgid "1 file" msgstr "1 bestand" -#: js/files.js:841 +#: js/files.js:842 msgid "{count} files" msgstr "{count} bestanden" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index 840adfacc66..9c8786e28cb 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-20 17:25+0000\n" -"Last-Translator: André Koot <meneer@tken.net>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,9 +28,9 @@ msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompati #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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, de backend zal dus niet werken. Vraag uw beheerder de module te installeren." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "Basis DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd." @@ -116,10 +120,18 @@ msgstr "Poort" msgid "Base User Tree" msgstr "Basis Gebruikers Structuur" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Basis Groupen Structuur" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Groepslid associatie" diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po index d9cd1698cae..8606d6f3164 100644 --- a/l10n/nl/user_webdavauth.po +++ b/l10n/nl/user_webdavauth.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# André Koot <meneer@tken.net>, 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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 09:56+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" @@ -21,7 +21,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "WebDAV authenticatie" #: templates/settings.php:4 msgid "URL: http://" @@ -32,4 +32,4 @@ 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 stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens." diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index 7f064cb1e25..4f58028284b 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po index 29bd7864d7e..3cc12b3e1f3 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 64357ad8259..1d4c605b737 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <bbartlomiej@gmail.com>, 2013. # Cyryl Sochacki <>, 2012. # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013. # Marcin Małecki <gerber@tkdami.net>, 2011-2012. @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-10 00:04+0100\n" -"PO-Revision-Date: 2013-01-09 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 08:30+0000\n" +"Last-Translator: bbartlomiej <bbartlomiej@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" @@ -27,16 +28,16 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "" +msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje" #: ajax/move.php:24 #, php-format msgid "Could not move %s" -msgstr "" +msgstr "Nie można było przenieść %s" #: ajax/rename.php:19 msgid "Unable to rename file" -msgstr "" +msgstr "Nie można zmienić nazwy pliku" #: ajax/upload.php:14 msgid "No file was uploaded. Unknown error" @@ -147,84 +148,84 @@ msgid "" "allowed." msgstr "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone." -#: js/files.js:186 +#: js/files.js:187 msgid "generating ZIP-file, it may take some time." msgstr "Generowanie pliku ZIP, może potrwać pewien czas." -#: js/files.js:224 +#: js/files.js:225 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów" -#: js/files.js:224 +#: js/files.js:225 msgid "Upload Error" msgstr "Błąd wczytywania" -#: js/files.js:241 +#: js/files.js:242 msgid "Close" msgstr "Zamknij" -#: js/files.js:260 js/files.js:376 js/files.js:409 +#: js/files.js:261 js/files.js:377 js/files.js:410 msgid "Pending" msgstr "Oczekujące" -#: js/files.js:280 +#: js/files.js:281 msgid "1 file uploading" msgstr "1 plik wczytany" -#: js/files.js:283 js/files.js:338 js/files.js:353 +#: js/files.js:284 js/files.js:339 js/files.js:354 msgid "{count} files uploading" msgstr "{count} przesyłanie plików" -#: js/files.js:357 js/files.js:393 +#: js/files.js:358 js/files.js:394 msgid "Upload cancelled." msgstr "Wczytywanie anulowane." -#: js/files.js:464 +#: js/files.js:465 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane." -#: js/files.js:537 +#: js/files.js:538 msgid "URL cannot be empty." msgstr "URL nie może być pusty." -#: js/files.js:543 +#: js/files.js:544 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud" -#: js/files.js:727 +#: js/files.js:728 msgid "{count} files scanned" msgstr "{count} pliki skanowane" -#: js/files.js:735 +#: js/files.js:736 msgid "error while scanning" msgstr "Wystąpił błąd podczas skanowania" -#: js/files.js:808 templates/index.php:64 +#: js/files.js:809 templates/index.php:64 msgid "Name" msgstr "Nazwa" -#: js/files.js:809 templates/index.php:75 +#: js/files.js:810 templates/index.php:75 msgid "Size" msgstr "Rozmiar" -#: js/files.js:810 templates/index.php:77 +#: js/files.js:811 templates/index.php:77 msgid "Modified" msgstr "Czas modyfikacji" -#: js/files.js:829 +#: js/files.js:830 msgid "1 folder" msgstr "1 folder" -#: js/files.js:831 +#: js/files.js:832 msgid "{count} folders" msgstr "{count} foldery" -#: js/files.js:839 +#: js/files.js:840 msgid "1 file" msgstr "1 plik" -#: js/files.js:841 +#: js/files.js:842 msgid "{count} files" msgstr "{count} pliki" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index 25b35d770df..cd8904acc25 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-19 00:03+0100\n" -"PO-Revision-Date: 2012-12-18 18:12+0000\n" -"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,9 +29,9 @@ msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są komp #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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." +"<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 msgid "Host" @@ -47,6 +47,10 @@ msgid "Base DN" msgstr "Baza DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -117,10 +121,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Drzewo bazy użytkowników" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Drzewo bazy grup" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Członek grupy stowarzyszenia" diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po index b5ba3ac474a..44e963a5a43 100644 --- a/l10n/pl/user_webdavauth.po +++ b/l10n/pl/user_webdavauth.po @@ -3,15 +3,16 @@ # 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. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 08:54+0000\n" +"Last-Translator: bbartlomiej <bbartlomiej@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" @@ -21,7 +22,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Uwierzytelnienie WebDAV" #: templates/settings.php:4 msgid "URL: http://" @@ -32,4 +33,4 @@ 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 wyśle dane uwierzytelniające do tego URL. Ten plugin sprawdza odpowiedź i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidłowe dane uwierzytelniające, a każdy inny kod odpowiedzi jako poprawne dane." diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po index de4bd2f3523..36eb526f464 100644 --- a/l10n/pl_PL/user_ldap.po +++ b/l10n/pl_PL/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index fdd9c02d90a..7596db8ad37 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "DN Base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -115,10 +119,18 @@ msgstr "Porta" msgid "Base User Tree" msgstr "Árvore de Usuário Base" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Árvore de Grupo Base" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Associação Grupo-Membro" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 2ecb6bd3751..2d18a9c616d 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-18 00:13+0100\n" -"PO-Revision-Date: 2012-12-17 01:25+0000\n" -"Last-Translator: Mouxy <daniel@mouxy.net>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,9 +30,9 @@ msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompative #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs 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 necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar." +"<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 msgid "Host" @@ -48,6 +48,10 @@ msgid "Base DN" msgstr "DN base" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -118,10 +122,18 @@ msgstr "Porto" msgid "Base User Tree" msgstr "Base da árvore de utilizadores." +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base da árvore de grupos." +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Associar utilizador ao grupo." diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index 171e91b27d4..41e4eebb9f3 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" -"PO-Revision-Date: 2012-12-26 05:09+0000\n" -"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,9 +29,9 @@ msgstr "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Es #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia" +"<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 msgid "Host" @@ -47,6 +47,10 @@ msgid "Base DN" msgstr "DN de bază" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -117,10 +121,18 @@ msgstr "Portul" msgid "Base User Tree" msgstr "Arborele de bază al Utilizatorilor" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Arborele de bază al Grupurilor" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asocierea Grup-Membru" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index 5ab21a67d52..383f6bb2909 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-16 00:11+0100\n" -"PO-Revision-Date: 2012-12-15 01:57+0000\n" -"Last-Translator: sam002 <semen@sam002.net>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -29,9 +29,9 @@ msgstr "<b>Внимание:</b>Приложения user_ldap и user_webdavaut #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Внимание:</b> Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его." +"<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 msgid "Host" @@ -47,6 +47,10 @@ msgid "Base DN" msgstr "Базовый DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"" @@ -117,10 +121,18 @@ msgstr "Порт" msgid "Base User Tree" msgstr "База пользовательского дерева" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "База группового дерева" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Ассоциация Группа-Участник" diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po index 4a514279ab3..ef2d84ebcb1 100644 --- a/l10n/ru_RU/user_ldap.po +++ b/l10n/ru_RU/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: 2012-12-19 00:03+0100\n" -"PO-Revision-Date: 2012-12-18 08:59+0000\n" -"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -27,9 +27,9 @@ msgstr "<b>Предупреждение:</b> Приложения user_ldap и u #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его." +"<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 msgid "Host" @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "База DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»" @@ -115,10 +119,18 @@ msgstr "Порт" msgid "Base User Tree" msgstr "Базовое дерево пользователей" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Базовое дерево групп" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Связь член-группа" diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po index f44ac30b3ea..536c0438d76 100644 --- a/l10n/si_LK/user_ldap.po +++ b/l10n/si_LK/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "තොට" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index e3e39e8a4ab..e11a2eda0fe 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -5,15 +5,16 @@ # Translators: # <intense.feel@gmail.com>, 2011, 2012. # <martin.babik@gmail.com>, 2012. +# <mehturt@gmail.com>, 2013. # Roman Priesol <roman@priesol.net>, 2012. # <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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:03+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 15:24+0000\n" +"Last-Translator: mehturt <mehturt@gmail.com>\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" @@ -24,26 +25,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Používateľ %s zdieľa s Vami súbor" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Používateľ %s zdieľa s Vami adresár" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Používateľ %s zdieľa s Vami súbor \"%s\". Môžete si ho stiahnuť tu: %s" #: ajax/share.php:90 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "" +msgstr "Používateľ %s zdieľa s Vami adresár \"%s\". Môžete si ho stiahnuť tu: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -216,11 +217,11 @@ msgstr "Heslo" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Odoslať odkaz osobe e-mailom" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Odoslať" #: js/share.js:177 msgid "Set expiration date" @@ -288,11 +289,11 @@ msgstr "Chyba pri nastavení dátumu vypršania platnosti" #: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Odosielam ..." #: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "Email odoslaný" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -566,4 +567,4 @@ msgstr "ďalej" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať." diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index fde4a583528..497fea635a1 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "Základné DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Základný používateľský strom" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Základný skupinový strom" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociácia člena skupiny" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index d34b56f8c01..9671d69486e 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-16 00:11+0100\n" -"PO-Revision-Date: 2012-12-15 16:46+0000\n" -"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -28,9 +28,9 @@ msgstr "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združlj #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "Osnovni DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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 Napredno" @@ -116,10 +120,18 @@ msgstr "Vrata" msgid "Base User Tree" msgstr "Osnovno uporabniško drevo" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Osnovno drevo skupine" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Povezava člana skupine" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po index 3c0afbd378a..4c54b0c5724 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po index 2af4aa92fab..c25b3394ef7 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index 47549f334d5..669260b275a 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:19+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index 76ca9c76224..a86fd7f318a 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/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: 2012-12-18 00:13+0100\n" -"PO-Revision-Date: 2012-12-17 19:54+0000\n" -"Last-Translator: Magnus Höglund <magnus@linux.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,9 +27,9 @@ msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Ov #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den." +"<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 msgid "Host" @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "Start DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Bas för användare i katalogtjänst" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Bas för grupper i katalogtjänst" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Attribut för gruppmedlemmar" diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po index e98a09afa8c..401d69aec01 100644 --- a/l10n/ta_LK/user_ldap.po +++ b/l10n/ta_LK/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "தள DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் " @@ -115,10 +119,18 @@ msgstr "துறை " msgid "Base User Tree" msgstr "தள பயனாளர் மரம்" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "தள குழு மரம்" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "குழு உறுப்பினர் சங்கம்" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 2416a322fed..134eac17b3f 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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.pot b/l10n/templates/files.pot index 71a87a2eb8e..1d7c90b6f12 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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 3d48a676cd3..43925266f03 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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_external.pot b/l10n/templates/files_external.pot index a0484a1a57c..542d06a7802 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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 7c96bb3b3f3..f40c0f94a36 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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_versions.pot b/l10n/templates/files_versions.pot index 128b1ac61f6..d0229e8b243 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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 e519b86fb93..f99614da37a 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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/settings.pot b/l10n/templates/settings.pot index c67eab1a278..612bafa43f1 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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/user_ldap.pot b/l10n/templates/user_ldap.pot index 6aadb806ab1..341f74b9b69 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will " -"not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -113,10 +117,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 0574055b738..60743a81921 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\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/user_ldap.po b/l10n/th_TH/user_ldap.po index c8a7bd651bd..c770828e2aa 100644 --- a/l10n/th_TH/user_ldap.po +++ b/l10n/th_TH/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "DN ฐาน" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้" @@ -115,10 +119,18 @@ msgstr "พอร์ต" msgid "Base User Tree" msgstr "รายการผู้ใช้งานหลักแบบ Tree" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "รายการกลุ่มหลักแบบ Tree" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 66d4941f8de..306152d4493 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/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: 2012-12-29 00:07+0100\n" -"PO-Revision-Date: 2012-12-28 09:39+0000\n" -"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -27,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "Base DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "Port" msgid "Base User Tree" msgstr "Temel Kullanıcı Ağacı" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Temel Grup Ağacı" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Grup-Üye işbirliği" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index b6601497ecb..24f0b5ffdbb 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-19 00:03+0100\n" -"PO-Revision-Date: 2012-12-18 12:52+0000\n" -"Last-Translator: volodya327 <volodya327@gmail.com>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,9 +28,9 @@ msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його." +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "Базовий DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково" @@ -116,10 +120,18 @@ msgstr "Порт" msgid "Base User Tree" msgstr "Основне Дерево Користувачів" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Основне Дерево Груп" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Асоціація Група-Член" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index c6157201e51..6e334612607 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -28,8 +28,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "DN cơ bản" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 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" @@ -116,10 +120,18 @@ msgstr "Cổng" msgid "Base User Tree" msgstr "Cây người dùng cơ bản" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "Cây nhóm cơ bản" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "Nhóm thành viên Cộng đồng" diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po index 75ea9d9c0e9..0e45bb6b182 100644 --- a/l10n/zh_CN.GB2312/user_ldap.po +++ b/l10n/zh_CN.GB2312/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "基本判别名" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "您可以在高级选项卡中为用户和群组指定基本判别名" @@ -115,10 +119,18 @@ msgstr "端口" msgid "Base User Tree" msgstr "基本用户树" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "基本群组树" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "群组-成员组合" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index c8011d2b2c7..b9c039f6bf8 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/user_ldap.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-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 11:27+0000\n" -"Last-Translator: marguerite su <i@marguerite.su>\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -28,9 +28,9 @@ msgstr "<b>警告：</b>应用 user_ldap 和 user_webdavauth 不兼容。您可 #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." -msgstr "<b>警告：</b>需要的 PHP LDAP 模块未安装，后端将无法工作。请垂询您的系统管理员来安装它。" +"<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 msgid "Host" @@ -46,6 +46,10 @@ msgid "Base DN" msgstr "Base DN" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "您可以在高级选项卡里为用户和组指定Base DN" @@ -116,10 +120,18 @@ msgstr "端口" msgid "Base User Tree" msgstr "基础用户树" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "基础组树" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "组成员关联" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index 24846079f01..8a7d8cdab9c 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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index 2bf0669ac23..eb47122f1b1 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+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,8 +27,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -45,6 +45,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -115,10 +119,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po index 3add8a2631e..e02fa17c60c 100644 --- a/l10n/zu_ZA/user_ldap.po +++ b/l10n/zu_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: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"POT-Creation-Date: 2013-01-16 00:19+0100\n" +"PO-Revision-Date: 2013-01-15 23:20+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" "MIME-Version: 1.0\n" @@ -26,8 +26,8 @@ msgstr "" #: templates/settings.php:11 msgid "" -"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" -" not work. Please ask your system administrator to install it." +"<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 @@ -44,6 +44,10 @@ msgid "Base DN" msgstr "" #: templates/settings.php:16 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" @@ -114,10 +118,18 @@ msgstr "" msgid "Base User Tree" msgstr "" +#: templates/settings.php:25 +msgid "One User Base DN per line" +msgstr "" + #: templates/settings.php:26 msgid "Base Group Tree" msgstr "" +#: templates/settings.php:26 +msgid "One Group Base DN per line" +msgstr "" + #: templates/settings.php:27 msgid "Group-Member association" msgstr "" diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index 9839dafbce1..8f057cfb6e8 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -98,7 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if ($this->connection) { $native_code = $this->connection->lastErrorCode(); } - $native_msg = html_entity_decode($this->_lasterror); + $native_msg = html_entity_decode($this->_lasterror); // PHP 5.2+ prepends the function name to $php_errormsg, so we need // this hack to work around it, per bug #9599. diff --git a/lib/api.php b/lib/api.php index c464cd04913..8d728d4311f 100644 --- a/lib/api.php +++ b/lib/api.php @@ -42,12 +42,12 @@ class OC_API { private static function init() { self::$server = new OC_OAuth_Server(new OC_OAuth_Store()); } - + /** * api actions */ protected static $actions = array(); - + /** * registers an api call * @param string $method the http method @@ -58,7 +58,7 @@ class OC_API { * @param array $defaults * @param array $requirements */ - public static function register($method, $url, $action, $app, + public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()) { @@ -73,7 +73,7 @@ class OC_API { } self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel); } - + /** * handles an api call * @param array $parameters @@ -92,7 +92,7 @@ class OC_API { $response = call_user_func(self::$actions[$name]['action'], $parameters); } else { $response = new OC_OCS_Result(null, 998, 'Api method not found'); - } + } } else { $response = new OC_OCS_Result(null, 997, 'Unauthorised'); } @@ -103,7 +103,7 @@ class OC_API { // logout the user to be stateless OC_User::logout(); } - + /** * authenticate the api call * @param array $action the action details as supplied to OC_API::register() @@ -148,18 +148,18 @@ class OC_API { return false; break; } - } - + } + /** * http basic auth * @return string|false (username, or false on failure) */ - private static function loginUser(){ + private static function loginUser(){ $authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : ''; $authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''; return OC_User::login($authUser, $authPw) ? $authUser : false; } - + /** * respond to a call * @param int|array $result the result from the api method @@ -195,5 +195,5 @@ class OC_API { } } } - + } diff --git a/lib/app.php b/lib/app.php index 05d1c818c70..68e1bc6a6ca 100644 --- a/lib/app.php +++ b/lib/app.php @@ -137,7 +137,7 @@ class OC_App{ OC_Appconfig::setValue($app, 'types', $appTypes); } - + /** * check if app is shipped * @param string $appid the id of the app to check diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php index 28b5ce3af20..9619dcb732c 100644 --- a/lib/backgroundjob.php +++ b/lib/backgroundjob.php @@ -34,7 +34,7 @@ class OC_BackgroundJob{ public static function getExecutionType() { return OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ); } - + /** * @brief sets the background jobs execution type * @param $type execution type diff --git a/lib/base.php b/lib/base.php index 80e5c5ed77b..6f537cf0893 100644 --- a/lib/base.php +++ b/lib/base.php @@ -29,171 +29,171 @@ require_once 'public/constants.php'; */ class OC { - /** - * Assoziative array for autoloading. classname => filename - */ - public static $CLASSPATH = array(); - /** - * The installation path for owncloud on the server (e.g. /srv/http/owncloud) - */ - public static $SERVERROOT = ''; - /** - * the current request path relative to the owncloud root (e.g. files/index.php) - */ - private static $SUBURI = ''; - /** - * the owncloud root path for http requests (e.g. owncloud/) - */ - public static $WEBROOT = ''; - /** - * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty) - */ - public static $THIRDPARTYROOT = ''; - /** - * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty) - */ - public static $THIRDPARTYWEBROOT = ''; - /** - * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and - * web path in 'url' - */ - public static $APPSROOTS = array(); - /* - * requested app - */ - public static $REQUESTEDAPP = ''; - /* - * requested file of app - */ - public static $REQUESTEDFILE = ''; - /** - * check if owncloud runs in cli mode - */ - public static $CLI = false; - /* - * OC router - */ - protected static $router = null; - - /** - * SPL autoload - */ - public static function autoload($className) - { - if (array_key_exists($className, OC::$CLASSPATH)) { - $path = OC::$CLASSPATH[$className]; - /** @TODO: Remove this when necessary - Remove "apps/" from inclusion path for smooth migration to mutli app dir - */ - if (strpos($path, 'apps/') === 0) { - OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG); - $path = str_replace('apps/', '', $path); - } - } elseif (strpos($className, 'OC_') === 0) { - $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php'); - } elseif (strpos($className, 'OC\\') === 0) { - $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); - } elseif (strpos($className, 'OCP\\') === 0) { - $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); - } elseif (strpos($className, 'OCA\\') === 0) { - $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); - } elseif (strpos($className, 'Sabre_') === 0) { - $path = str_replace('_', '/', $className) . '.php'; - } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) { - $path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php'; - } elseif (strpos($className, 'Sabre\\VObject') === 0) { - $path = str_replace('\\', '/', $className) . '.php'; - } elseif (strpos($className, 'Test_') === 0) { - $path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php'); + /** + * Assoziative array for autoloading. classname => filename + */ + public static $CLASSPATH = array(); + /** + * The installation path for owncloud on the server (e.g. /srv/http/owncloud) + */ + public static $SERVERROOT = ''; + /** + * the current request path relative to the owncloud root (e.g. files/index.php) + */ + private static $SUBURI = ''; + /** + * the owncloud root path for http requests (e.g. owncloud/) + */ + public static $WEBROOT = ''; + /** + * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty) + */ + public static $THIRDPARTYROOT = ''; + /** + * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty) + */ + public static $THIRDPARTYWEBROOT = ''; + /** + * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and + * web path in 'url' + */ + public static $APPSROOTS = array(); + /* + * requested app + */ + public static $REQUESTEDAPP = ''; + /* + * requested file of app + */ + public static $REQUESTEDFILE = ''; + /** + * check if owncloud runs in cli mode + */ + public static $CLI = false; + /* + * OC router + */ + protected static $router = null; + + /** + * SPL autoload + */ + public static function autoload($className) + { + if (array_key_exists($className, OC::$CLASSPATH)) { + $path = OC::$CLASSPATH[$className]; + /** @TODO: Remove this when necessary + Remove "apps/" from inclusion path for smooth migration to mutli app dir + */ + if (strpos($path, 'apps/') === 0) { + OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG); + $path = str_replace('apps/', '', $path); + } + } elseif (strpos($className, 'OC_') === 0) { + $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php'); + } elseif (strpos($className, 'OC\\') === 0) { + $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + } elseif (strpos($className, 'OCP\\') === 0) { + $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + } elseif (strpos($className, 'OCA\\') === 0) { + $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + } elseif (strpos($className, 'Sabre_') === 0) { + $path = str_replace('_', '/', $className) . '.php'; + } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) { + $path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php'; + } elseif (strpos($className, 'Sabre\\VObject') === 0) { + $path = str_replace('\\', '/', $className) . '.php'; + } elseif (strpos($className, 'Test_') === 0) { + $path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php'); } elseif (strpos($className, 'Test\\') === 0) { $path = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($className, 5)) . '.php'); - } else { - return false; - } - - if ($fullPath = stream_resolve_include_path($path)) { - require_once $fullPath; - } - return false; - } - - public static function initPaths() - { - // calculate the root directories - OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4)); - OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT))); - $scriptName = $_SERVER["SCRIPT_NAME"]; - if (substr($scriptName, -1) == '/') { - $scriptName .= 'index.php'; - //make sure suburi follows the same rules as scriptName - if (substr(OC::$SUBURI, -9) != 'index.php') { - if (substr(OC::$SUBURI, -1) != '/') { - OC::$SUBURI = OC::$SUBURI . '/'; - } - OC::$SUBURI = OC::$SUBURI . 'index.php'; - } - } - - OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI)); - - if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') { - OC::$WEBROOT = '/' . OC::$WEBROOT; - } - - // ensure we can find OC_Config - set_include_path( - OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . - get_include_path() - ); - - // search the 3rdparty folder - if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') { - OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', ''); - OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', ''); - } elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) { - OC::$THIRDPARTYROOT = OC::$SERVERROOT; - OC::$THIRDPARTYWEBROOT = OC::$WEBROOT; - } elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) { - OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/'); - OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/'); - } else { - echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file."); - exit; - } - // search the apps folder - $config_paths = OC_Config::getValue('apps_paths', array()); - if (!empty($config_paths)) { - foreach ($config_paths as $paths) { - if (isset($paths['url']) && isset($paths['path'])) { - $paths['url'] = rtrim($paths['url'], '/'); - $paths['path'] = rtrim($paths['path'], '/'); - OC::$APPSROOTS[] = $paths; - } - } - } elseif (file_exists(OC::$SERVERROOT . '/apps')) { - OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true); - } elseif (file_exists(OC::$SERVERROOT . '/../apps')) { - OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true); - } - - if (empty(OC::$APPSROOTS)) { - echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file."); - exit; - } - $paths = array(); - foreach (OC::$APPSROOTS as $path) - $paths[] = $path['path']; - - // set the right include path - set_include_path( - OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . - OC::$SERVERROOT . '/config' . PATH_SEPARATOR . - OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . - implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . - get_include_path() . PATH_SEPARATOR . - OC::$SERVERROOT - ); - } + } else { + return false; + } + + if ($fullPath = stream_resolve_include_path($path)) { + require_once $fullPath; + } + return false; + } + + public static function initPaths() + { + // calculate the root directories + OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4)); + OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT))); + $scriptName = $_SERVER["SCRIPT_NAME"]; + if (substr($scriptName, -1) == '/') { + $scriptName .= 'index.php'; + //make sure suburi follows the same rules as scriptName + if (substr(OC::$SUBURI, -9) != 'index.php') { + if (substr(OC::$SUBURI, -1) != '/') { + OC::$SUBURI = OC::$SUBURI . '/'; + } + OC::$SUBURI = OC::$SUBURI . 'index.php'; + } + } + + OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI)); + + if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') { + OC::$WEBROOT = '/' . OC::$WEBROOT; + } + + // ensure we can find OC_Config + set_include_path( + OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . + get_include_path() + ); + + // search the 3rdparty folder + if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') { + OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', ''); + OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', ''); + } elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) { + OC::$THIRDPARTYROOT = OC::$SERVERROOT; + OC::$THIRDPARTYWEBROOT = OC::$WEBROOT; + } elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) { + OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/'); + OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/'); + } else { + echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file."); + exit; + } + // search the apps folder + $config_paths = OC_Config::getValue('apps_paths', array()); + if (!empty($config_paths)) { + foreach ($config_paths as $paths) { + if (isset($paths['url']) && isset($paths['path'])) { + $paths['url'] = rtrim($paths['url'], '/'); + $paths['path'] = rtrim($paths['path'], '/'); + OC::$APPSROOTS[] = $paths; + } + } + } elseif (file_exists(OC::$SERVERROOT . '/apps')) { + OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true); + } elseif (file_exists(OC::$SERVERROOT . '/../apps')) { + OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true); + } + + if (empty(OC::$APPSROOTS)) { + echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file."); + exit; + } + $paths = array(); + foreach (OC::$APPSROOTS as $path) + $paths[] = $path['path']; + + // set the right include path + set_include_path( + OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . + OC::$SERVERROOT . '/config' . PATH_SEPARATOR . + OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . + implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . + get_include_path() . PATH_SEPARATOR . + OC::$SERVERROOT + ); + } public static function checkConfig() { if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) { @@ -204,31 +204,31 @@ class OC } } - public static function checkInstalled() - { - // Redirect to installer if not installed - if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') { - if (!OC::$CLI) { - $url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php'; - header("Location: $url"); - } - exit(); - } - } - - public static function checkSSL() - { - // redirect to https site if configured - if (OC_Config::getValue("forcessl", false)) { - header('Strict-Transport-Security: max-age=31536000'); - ini_set("session.cookie_secure", "on"); - if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) { - $url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI']; - header("Location: $url"); - exit(); - } - } - } + public static function checkInstalled() + { + // Redirect to installer if not installed + if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') { + if (!OC::$CLI) { + $url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php'; + header("Location: $url"); + } + exit(); + } + } + + public static function checkSSL() + { + // redirect to https site if configured + if (OC_Config::getValue("forcessl", false)) { + header('Strict-Transport-Security: max-age=31536000'); + ini_set("session.cookie_secure", "on"); + if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) { + $url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI']; + header("Location: $url"); + exit(); + } + } + } public static function checkMaintenanceMode() { // Allow ajax update script to execute without being stopped @@ -260,504 +260,504 @@ class OC } } - public static function initTemplateEngine() - { - // Add the stuff we need always - OC_Util::addScript("jquery-1.7.2.min"); - OC_Util::addScript("jquery-ui-1.8.16.custom.min"); - OC_Util::addScript("jquery-showpassword"); - OC_Util::addScript("jquery.infieldlabel"); - OC_Util::addScript("jquery-tipsy"); - OC_Util::addScript("oc-dialogs"); - OC_Util::addScript("js"); - OC_Util::addScript("eventsource"); - OC_Util::addScript("config"); - //OC_Util::addScript( "multiselect" ); - OC_Util::addScript('search', 'result'); - OC_Util::addScript('router'); - - OC_Util::addStyle("styles"); - OC_Util::addStyle("multiselect"); - OC_Util::addStyle("jquery-ui-1.8.16.custom"); - OC_Util::addStyle("jquery-tipsy"); - } - - public static function initSession() - { - // prevents javascript from accessing php session cookies - ini_set('session.cookie_httponly', '1;'); - - // set the session name to the instance id - which is unique - session_name(OC_Util::getInstanceId()); - - // (re)-initialize session - session_start(); - - // regenerate session id periodically to avoid session fixation - if (!isset($_SESSION['SID_CREATED'])) { - $_SESSION['SID_CREATED'] = time(); - } else if (time() - $_SESSION['SID_CREATED'] > 900) { - session_regenerate_id(true); - $_SESSION['SID_CREATED'] = time(); - } - - // session timeout - if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) { - if (isset($_COOKIE[session_name()])) { - setcookie(session_name(), '', time() - 42000, '/'); - } - session_unset(); - session_destroy(); - session_start(); - } - $_SESSION['LAST_ACTIVITY'] = time(); - } - - public static function getRouter() - { - if (!isset(OC::$router)) { - OC::$router = new OC_Router(); - OC::$router->loadRoutes(); - } - - return OC::$router; - } - - public static function init() - { - // register autoloader - spl_autoload_register(array('OC', 'autoload')); - setlocale(LC_ALL, 'en_US.UTF-8'); - - // set some stuff - //ob_start(); - error_reporting(E_ALL | E_STRICT); - if (defined('DEBUG') && DEBUG) { - ini_set('display_errors', 1); - } - self::$CLI = (php_sapi_name() == 'cli'); - - date_default_timezone_set('UTC'); - ini_set('arg_separator.output', '&'); - - // try to switch magic quotes off. - if (get_magic_quotes_gpc()) { - @set_magic_quotes_runtime(false); - } - - //try to configure php to enable big file uploads. - //this doesn´t work always depending on the webserver and php configuration. - //Let´s try to overwrite some defaults anyways - - //try to set the maximum execution time to 60min - @set_time_limit(3600); - @ini_set('max_execution_time', 3600); - @ini_set('max_input_time', 3600); - - //try to set the maximum filesize to 10G - @ini_set('upload_max_filesize', '10G'); - @ini_set('post_max_size', '10G'); - @ini_set('file_uploads', '50'); - - //try to set the session lifetime to 60min - @ini_set('gc_maxlifetime', '3600'); - - //copy http auth headers for apache+php-fcgid work around - if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) { - $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION']; - } - - //set http auth headers for apache+php-cgi work around - if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) { - list($name, $password) = explode(':', base64_decode($matches[1]), 2); - $_SERVER['PHP_AUTH_USER'] = strip_tags($name); - $_SERVER['PHP_AUTH_PW'] = strip_tags($password); - } - - //set http auth headers for apache+php-cgi work around if variable gets renamed by apache - if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) { - list($name, $password) = explode(':', base64_decode($matches[1]), 2); - $_SERVER['PHP_AUTH_USER'] = strip_tags($name); - $_SERVER['PHP_AUTH_PW'] = strip_tags($password); - } - - self::initPaths(); - - register_shutdown_function(array('OC_Log', 'onShutdown')); - set_error_handler(array('OC_Log', 'onError')); - set_exception_handler(array('OC_Log', 'onException')); - - // set debug mode if an xdebug session is active - if (!defined('DEBUG') || !DEBUG) { - if (isset($_COOKIE['XDEBUG_SESSION'])) { - define('DEBUG', true); - } - } - - // register the stream wrappers - require_once 'streamwrappers.php'; - stream_wrapper_register("fakedir", "OC_FakeDirStream"); - stream_wrapper_register('static', 'OC_StaticStreamWrapper'); - stream_wrapper_register('close', 'OC_CloseStreamWrapper'); - - self::checkConfig(); - self::checkInstalled(); - self::checkSSL(); - self::initSession(); - self::initTemplateEngine(); - self::checkMaintenanceMode(); - self::checkUpgrade(); - - $errors = OC_Util::checkServer(); - if (count($errors) > 0) { - OC_Template::printGuestPage('', 'error', array('errors' => $errors)); - exit; - } - - // User and Groups - if (!OC_Config::getValue("installed", false)) { - $_SESSION['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']) { - OC_User::logout(); - } - - // Load Apps - // This includes plugins for users and filesystems as well - global $RUNTIME_NOAPPS; - global $RUNTIME_APPTYPES; - if (!$RUNTIME_NOAPPS) { - if ($RUNTIME_APPTYPES) { - OC_App::loadApps($RUNTIME_APPTYPES); - } else { - OC_App::loadApps(); - } - } - - //setup extra user backends - OC_User::setupBackends(); - - self::registerCacheHooks(); - self::registerFilesystemHooks(); - self::registerShareHooks(); - - //make sure temporary files are cleaned up - register_shutdown_function(array('OC_Helper', 'cleanTmp')); - - //parse the given parameters - self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files')); - if (substr_count(self::$REQUESTEDAPP, '?') != 0) { - $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?')); - $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1); - parse_str($param, $get); - $_GET = array_merge($_GET, $get); - self::$REQUESTEDAPP = $app; - $_GET['app'] = $app; - } - self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null); - if (substr_count(self::$REQUESTEDFILE, '?') != 0) { - $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?')); - $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1); - parse_str($param, $get); - $_GET = array_merge($_GET, $get); - self::$REQUESTEDFILE = $file; - $_GET['getfile'] = $file; - } - if (!is_null(self::$REQUESTEDFILE)) { - $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE; - $parent = OC_App::getAppPath(OC::$REQUESTEDAPP); - if (!OC_Helper::issubdirectory($subdir, $parent)) { - self::$REQUESTEDFILE = null; - header('HTTP/1.0 404 Not Found'); - exit; - } - } - - // write error into log if locale can't be set - if (OC_Util::issetlocaleworking() == false) { - OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR); - } - if (OC_Config::getValue('installed', false)) { - if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { - OC_Util::addScript('backgroundjobs'); + public static function initTemplateEngine() + { + // Add the stuff we need always + OC_Util::addScript("jquery-1.7.2.min"); + OC_Util::addScript("jquery-ui-1.8.16.custom.min"); + OC_Util::addScript("jquery-showpassword"); + OC_Util::addScript("jquery.infieldlabel"); + OC_Util::addScript("jquery-tipsy"); + OC_Util::addScript("oc-dialogs"); + OC_Util::addScript("js"); + OC_Util::addScript("eventsource"); + OC_Util::addScript("config"); + //OC_Util::addScript( "multiselect" ); + OC_Util::addScript('search', 'result'); + OC_Util::addScript('router'); + + OC_Util::addStyle("styles"); + OC_Util::addStyle("multiselect"); + OC_Util::addStyle("jquery-ui-1.8.16.custom"); + OC_Util::addStyle("jquery-tipsy"); + } + + public static function initSession() + { + // prevents javascript from accessing php session cookies + ini_set('session.cookie_httponly', '1;'); + + // set the session name to the instance id - which is unique + session_name(OC_Util::getInstanceId()); + + // (re)-initialize session + session_start(); + + // regenerate session id periodically to avoid session fixation + if (!isset($_SESSION['SID_CREATED'])) { + $_SESSION['SID_CREATED'] = time(); + } else if (time() - $_SESSION['SID_CREATED'] > 900) { + session_regenerate_id(true); + $_SESSION['SID_CREATED'] = time(); + } + + // session timeout + if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) { + if (isset($_COOKIE[session_name()])) { + setcookie(session_name(), '', time() - 42000, '/'); + } + session_unset(); + session_destroy(); + session_start(); + } + $_SESSION['LAST_ACTIVITY'] = time(); + } + + public static function getRouter() + { + if (!isset(OC::$router)) { + OC::$router = new OC_Router(); + OC::$router->loadRoutes(); + } + + return OC::$router; + } + + public static function init() + { + // register autoloader + spl_autoload_register(array('OC', 'autoload')); + setlocale(LC_ALL, 'en_US.UTF-8'); + + // set some stuff + //ob_start(); + error_reporting(E_ALL | E_STRICT); + if (defined('DEBUG') && DEBUG) { + ini_set('display_errors', 1); + } + self::$CLI = (php_sapi_name() == 'cli'); + + date_default_timezone_set('UTC'); + ini_set('arg_separator.output', '&'); + + // try to switch magic quotes off. + if (get_magic_quotes_gpc()) { + @set_magic_quotes_runtime(false); + } + + //try to configure php to enable big file uploads. + //this doesn´t work always depending on the webserver and php configuration. + //Let´s try to overwrite some defaults anyways + + //try to set the maximum execution time to 60min + @set_time_limit(3600); + @ini_set('max_execution_time', 3600); + @ini_set('max_input_time', 3600); + + //try to set the maximum filesize to 10G + @ini_set('upload_max_filesize', '10G'); + @ini_set('post_max_size', '10G'); + @ini_set('file_uploads', '50'); + + //try to set the session lifetime to 60min + @ini_set('gc_maxlifetime', '3600'); + + //copy http auth headers for apache+php-fcgid work around + if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) { + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION']; + } + + //set http auth headers for apache+php-cgi work around + if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) { + list($name, $password) = explode(':', base64_decode($matches[1]), 2); + $_SERVER['PHP_AUTH_USER'] = strip_tags($name); + $_SERVER['PHP_AUTH_PW'] = strip_tags($password); + } + + //set http auth headers for apache+php-cgi work around if variable gets renamed by apache + if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) { + list($name, $password) = explode(':', base64_decode($matches[1]), 2); + $_SERVER['PHP_AUTH_USER'] = strip_tags($name); + $_SERVER['PHP_AUTH_PW'] = strip_tags($password); + } + + self::initPaths(); + + register_shutdown_function(array('OC_Log', 'onShutdown')); + set_error_handler(array('OC_Log', 'onError')); + set_exception_handler(array('OC_Log', 'onException')); + + // set debug mode if an xdebug session is active + if (!defined('DEBUG') || !DEBUG) { + if (isset($_COOKIE['XDEBUG_SESSION'])) { + define('DEBUG', true); + } + } + + // register the stream wrappers + require_once 'streamwrappers.php'; + stream_wrapper_register("fakedir", "OC_FakeDirStream"); + stream_wrapper_register('static', 'OC_StaticStreamWrapper'); + stream_wrapper_register('close', 'OC_CloseStreamWrapper'); + + self::checkConfig(); + self::checkInstalled(); + self::checkSSL(); + self::initSession(); + self::initTemplateEngine(); + self::checkMaintenanceMode(); + self::checkUpgrade(); + + $errors = OC_Util::checkServer(); + if (count($errors) > 0) { + OC_Template::printGuestPage('', 'error', array('errors' => $errors)); + exit; + } + + // User and Groups + if (!OC_Config::getValue("installed", false)) { + $_SESSION['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']) { + OC_User::logout(); + } + + // Load Apps + // This includes plugins for users and filesystems as well + global $RUNTIME_NOAPPS; + global $RUNTIME_APPTYPES; + if (!$RUNTIME_NOAPPS) { + if ($RUNTIME_APPTYPES) { + OC_App::loadApps($RUNTIME_APPTYPES); + } else { + OC_App::loadApps(); + } + } + + //setup extra user backends + OC_User::setupBackends(); + + self::registerCacheHooks(); + self::registerFilesystemHooks(); + self::registerShareHooks(); + + //make sure temporary files are cleaned up + register_shutdown_function(array('OC_Helper', 'cleanTmp')); + + //parse the given parameters + self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files')); + if (substr_count(self::$REQUESTEDAPP, '?') != 0) { + $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?')); + $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1); + parse_str($param, $get); + $_GET = array_merge($_GET, $get); + self::$REQUESTEDAPP = $app; + $_GET['app'] = $app; + } + self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null); + if (substr_count(self::$REQUESTEDFILE, '?') != 0) { + $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?')); + $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1); + parse_str($param, $get); + $_GET = array_merge($_GET, $get); + self::$REQUESTEDFILE = $file; + $_GET['getfile'] = $file; + } + if (!is_null(self::$REQUESTEDFILE)) { + $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE; + $parent = OC_App::getAppPath(OC::$REQUESTEDAPP); + if (!OC_Helper::issubdirectory($subdir, $parent)) { + self::$REQUESTEDFILE = null; + header('HTTP/1.0 404 Not Found'); + exit; + } + } + + // write error into log if locale can't be set + if (OC_Util::issetlocaleworking() == false) { + OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR); + } + if (OC_Config::getValue('installed', false)) { + if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { + OC_Util::addScript('backgroundjobs'); + } + } + } + + /** + * 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'); + } + + /** + * register hooks for the filesystem + */ + public static function registerFilesystemHooks() + { + // Check for blacklisted files + OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); + OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + } + + /** + * 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'); + } + + /** + * @brief Handle the request + */ + public static function handleRequest() + { + if (!OC_Config::getValue('installed', false)) { + require_once 'core/setup.php'; + exit(); + } + // Handle redirect URL for logged in users + if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { + $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url'])); + header('Location: ' . $location); + return; + } + // Handle WebDAV + if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') { + header('location: ' . OC_Helper::linkToRemote('webdav')); + return; + } + try { + OC::getRouter()->match(OC_Request::getPathInfo()); + return; + } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { + //header('HTTP/1.0 404 Not Found'); + } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) { + OC_Response::setStatus(405); + return; + } + $app = OC::$REQUESTEDAPP; + $file = OC::$REQUESTEDFILE; + $param = array('app' => $app, 'file' => $file); + // Handle app css files + if (substr($file, -3) == 'css') { + self::loadCSSFile($param); + return; + } + // Someone is logged in : + if (OC_User::isLoggedIn()) { + OC_App::loadApps(); + OC_User::setupBackends(); + if (isset($_GET["logout"]) and ($_GET["logout"])) { + if (isset($_COOKIE['oc_token'])) { + OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); + } + OC_User::logout(); + header("Location: " . OC::$WEBROOT . '/'); + } else { + if (is_null($file)) { + $param['file'] = 'index.php'; + } + $file_ext = substr($param['file'], -3); + if ($file_ext != 'php' + || !self::loadAppScriptFile($param) + ) { + header('HTTP/1.0 404 Not Found'); + } + } + return; + } + // Not handled and not logged in + self::handleLogin(); + } + + public static function loadAppScriptFile($param) + { + OC_App::loadApps(); + $app = $param['app']; + $file = $param['file']; + $app_path = OC_App::getAppPath($app); + $file = $app_path . '/' . $file; + unset($app, $app_path); + if (file_exists($file)) { + require_once $file; + return true; + } + return false; + } + + public static function loadCSSFile($param) + { + $app = $param['app']; + $file = $param['file']; + $app_path = OC_App::getAppPath($app); + if (file_exists($app_path . '/' . $file)) { + $app_web_path = OC_App::getAppWebPath($app); + $filepath = $app_web_path . '/' . $file; + $minimizer = new OC_Minimizer_CSS(); + $info = array($app_path, $app_web_path, $file); + $minimizer->output(array($info), $filepath); + } + } + + protected static function handleLogin() + { + OC_App::loadApps(array('prelogin')); + $error = array(); + // remember was checked after last login + if (OC::tryRememberLogin()) { + $error[] = 'invalidcookie'; + + // Someone wants to log in : + } elseif (OC::tryFormLogin()) { + $error[] = 'invalidpassword'; + + // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP + } elseif (OC::tryBasicAuthLogin()) { + $error[] = 'invalidpassword'; + } + OC_Util::displayLoginPage(array_unique($error)); + } + + protected static function cleanupLoginTokens($user) + { + $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); + $tokens = OC_Preferences::getKeys($user, 'login_token'); + foreach ($tokens as $token) { + $time = OC_Preferences::getValue($user, 'login_token', $token); + if ($time < $cutoff) { + OC_Preferences::deleteKey($user, 'login_token', $token); + } + } + } + + protected static function tryRememberLogin() + { + if (!isset($_COOKIE["oc_remember_login"]) + || !isset($_COOKIE["oc_token"]) + || !isset($_COOKIE["oc_username"]) + || !$_COOKIE["oc_remember_login"] + ) { + return false; + } + OC_App::loadApps(array('authentication')); + if (defined("DEBUG") && DEBUG) { + OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG); + } + // confirm credentials in cookie + if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) { + // delete outdated cookies + self::cleanupLoginTokens($_COOKIE['oc_username']); + // get stored tokens + $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token'); + // test cookies token against stored tokens + if (in_array($_COOKIE['oc_token'], $tokens, true)) { + // replace successfully used token with a new one + OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']); + $token = OC_Util::generate_random_bytes(32); + OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time()); + OC_User::setMagicInCookie($_COOKIE['oc_username'], $token); + // login + OC_User::setUserId($_COOKIE['oc_username']); + OC_Util::redirectToDefaultPage(); + // doesn't return + } + // if you reach this point you have changed your password + // or you are an attacker + // we can not delete tokens here because users may reach + // this point multiple times after a password change + OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN); + } + OC_User::unsetMagicInCookie(); + return true; + } + + protected static function tryFormLogin() + { + if (!isset($_POST["user"]) || !isset($_POST['password'])) { + return false; } + + OC_App::loadApps(); + + //setup extra user backends + OC_User::setupBackends(); + + if (OC_User::login($_POST["user"], $_POST["password"])) { + // setting up the time zone + if (isset($_POST['timezone-offset'])) { + $_SESSION['timezone'] = $_POST['timezone-offset']; + } + + self::cleanupLoginTokens($_POST['user']); + if (!empty($_POST["remember_login"])) { + if (defined("DEBUG") && DEBUG) { + OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); + } + $token = OC_Util::generate_random_bytes(32); + OC_Preferences::setValue($_POST['user'], 'login_token', $token, time()); + OC_User::setMagicInCookie($_POST["user"], $token); + } else { + OC_User::unsetMagicInCookie(); + } + OC_Util::redirectToDefaultPage(); + exit(); + } + return true; + } + + protected static function tryBasicAuthLogin() + { + if (!isset($_SERVER["PHP_AUTH_USER"]) + || !isset($_SERVER["PHP_AUTH_PW"]) + ) { + return false; + } + OC_App::loadApps(array('authentication')); + if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); + OC_User::unsetMagicInCookie(); + $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''); + OC_Util::redirectToDefaultPage(); + } + return true; } - } - - /** - * 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'); - } - - /** - * register hooks for the filesystem - */ - public static function registerFilesystemHooks() - { - // Check for blacklisted files - OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); - OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); - } - - /** - * 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'); - } - - /** - * @brief Handle the request - */ - public static function handleRequest() - { - if (!OC_Config::getValue('installed', false)) { - require_once 'core/setup.php'; - exit(); - } - // Handle redirect URL for logged in users - if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { - $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url'])); - header('Location: ' . $location); - return; - } - // Handle WebDAV - if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') { - header('location: ' . OC_Helper::linkToRemote('webdav')); - return; - } - try { - OC::getRouter()->match(OC_Request::getPathInfo()); - return; - } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { - //header('HTTP/1.0 404 Not Found'); - } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) { - OC_Response::setStatus(405); - return; - } - $app = OC::$REQUESTEDAPP; - $file = OC::$REQUESTEDFILE; - $param = array('app' => $app, 'file' => $file); - // Handle app css files - if (substr($file, -3) == 'css') { - self::loadCSSFile($param); - return; - } - // Someone is logged in : - if (OC_User::isLoggedIn()) { - OC_App::loadApps(); - OC_User::setupBackends(); - if (isset($_GET["logout"]) and ($_GET["logout"])) { - if (isset($_COOKIE['oc_token'])) { - OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); - } - OC_User::logout(); - header("Location: " . OC::$WEBROOT . '/'); - } else { - if (is_null($file)) { - $param['file'] = 'index.php'; - } - $file_ext = substr($param['file'], -3); - if ($file_ext != 'php' - || !self::loadAppScriptFile($param) - ) { - header('HTTP/1.0 404 Not Found'); - } - } - return; - } - // Not handled and not logged in - self::handleLogin(); - } - - public static function loadAppScriptFile($param) - { - OC_App::loadApps(); - $app = $param['app']; - $file = $param['file']; - $app_path = OC_App::getAppPath($app); - $file = $app_path . '/' . $file; - unset($app, $app_path); - if (file_exists($file)) { - require_once $file; - return true; - } - return false; - } - - public static function loadCSSFile($param) - { - $app = $param['app']; - $file = $param['file']; - $app_path = OC_App::getAppPath($app); - if (file_exists($app_path . '/' . $file)) { - $app_web_path = OC_App::getAppWebPath($app); - $filepath = $app_web_path . '/' . $file; - $minimizer = new OC_Minimizer_CSS(); - $info = array($app_path, $app_web_path, $file); - $minimizer->output(array($info), $filepath); - } - } - - protected static function handleLogin() - { - OC_App::loadApps(array('prelogin')); - $error = array(); - // remember was checked after last login - if (OC::tryRememberLogin()) { - $error[] = 'invalidcookie'; - - // Someone wants to log in : - } elseif (OC::tryFormLogin()) { - $error[] = 'invalidpassword'; - - // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP - } elseif (OC::tryBasicAuthLogin()) { - $error[] = 'invalidpassword'; - } - OC_Util::displayLoginPage(array_unique($error)); - } - - protected static function cleanupLoginTokens($user) - { - $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); - $tokens = OC_Preferences::getKeys($user, 'login_token'); - foreach ($tokens as $token) { - $time = OC_Preferences::getValue($user, 'login_token', $token); - if ($time < $cutoff) { - OC_Preferences::deleteKey($user, 'login_token', $token); - } - } - } - - protected static function tryRememberLogin() - { - if (!isset($_COOKIE["oc_remember_login"]) - || !isset($_COOKIE["oc_token"]) - || !isset($_COOKIE["oc_username"]) - || !$_COOKIE["oc_remember_login"] - ) { - return false; - } - OC_App::loadApps(array('authentication')); - if (defined("DEBUG") && DEBUG) { - OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG); - } - // confirm credentials in cookie - if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) { - // delete outdated cookies - self::cleanupLoginTokens($_COOKIE['oc_username']); - // get stored tokens - $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token'); - // test cookies token against stored tokens - if (in_array($_COOKIE['oc_token'], $tokens, true)) { - // replace successfully used token with a new one - OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']); - $token = OC_Util::generate_random_bytes(32); - OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time()); - OC_User::setMagicInCookie($_COOKIE['oc_username'], $token); - // login - OC_User::setUserId($_COOKIE['oc_username']); - OC_Util::redirectToDefaultPage(); - // doesn't return - } - // if you reach this point you have changed your password - // or you are an attacker - // we can not delete tokens here because users may reach - // this point multiple times after a password change - OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN); - } - OC_User::unsetMagicInCookie(); - return true; - } - - protected static function tryFormLogin() - { - if (!isset($_POST["user"]) || !isset($_POST['password'])) { - return false; - } - - OC_App::loadApps(); - - //setup extra user backends - OC_User::setupBackends(); - - if (OC_User::login($_POST["user"], $_POST["password"])) { - // setting up the time zone - if (isset($_POST['timezone-offset'])) { - $_SESSION['timezone'] = $_POST['timezone-offset']; - } - - self::cleanupLoginTokens($_POST['user']); - if (!empty($_POST["remember_login"])) { - if (defined("DEBUG") && DEBUG) { - OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); - } - $token = OC_Util::generate_random_bytes(32); - OC_Preferences::setValue($_POST['user'], 'login_token', $token, time()); - OC_User::setMagicInCookie($_POST["user"], $token); - } else { - OC_User::unsetMagicInCookie(); - } - OC_Util::redirectToDefaultPage(); - exit(); - } - return true; - } - - protected static function tryBasicAuthLogin() - { - if (!isset($_SERVER["PHP_AUTH_USER"]) - || !isset($_SERVER["PHP_AUTH_PW"]) - ) { - return false; - } - OC_App::loadApps(array('authentication')); - if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); - OC_User::unsetMagicInCookie(); - $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''); - OC_Util::redirectToDefaultPage(); - } - return true; - } } // define runtime variables - unless this already has been done if (!isset($RUNTIME_NOAPPS)) { - $RUNTIME_NOAPPS = false; + $RUNTIME_NOAPPS = false; } if (!function_exists('get_temp_dir')) { - function get_temp_dir() - { - if ($temp = ini_get('upload_tmp_dir')) return $temp; - if ($temp = getenv('TMP')) return $temp; - if ($temp = getenv('TEMP')) return $temp; - if ($temp = getenv('TMPDIR')) return $temp; - $temp = tempnam(__FILE__, ''); - if (file_exists($temp)) { - unlink($temp); - return dirname($temp); - } - if ($temp = sys_get_temp_dir()) return $temp; - - return null; - } + function get_temp_dir() + { + if ($temp = ini_get('upload_tmp_dir')) return $temp; + if ($temp = getenv('TMP')) return $temp; + if ($temp = getenv('TEMP')) return $temp; + if ($temp = getenv('TMPDIR')) return $temp; + $temp = tempnam(__FILE__, ''); + if (file_exists($temp)) { + unlink($temp); + return dirname($temp); + } + if ($temp = sys_get_temp_dir()) return $temp; + + return null; + } } OC::init(); diff --git a/lib/cache/apc.php b/lib/cache/apc.php index 6dda0a0ff8c..895d307ea26 100644 --- a/lib/cache/apc.php +++ b/lib/cache/apc.php @@ -57,7 +57,7 @@ class OC_Cache_APC { if(!function_exists('apc_exists')) { function apc_exists($keys) { - $result; + $result=false; apc_fetch($keys, $result); return $result; } diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 93d8fc477d6..b48d3b41f24 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -176,9 +176,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * @brief Returns a list of properties for this nodes.; * @param array $properties * @return array - * @note The properties list is a list of propertynames the client - * requested, encoded as xmlnamespace#tagName, for example: - * http://www.example.org/namespace#author If the array is empty, all + * @note The properties list is a list of propertynames the client + * requested, encoded as xmlnamespace#tagName, for example: + * http://www.example.org/namespace#author If the array is empty, all * properties should be returned */ public function getProperties($properties) { diff --git a/lib/db.php b/lib/db.php index 74e7ca5b0e0..5224d5ee7da 100644 --- a/lib/db.php +++ b/lib/db.php @@ -41,6 +41,8 @@ class OC_DB { const BACKEND_PDO=0; const BACKEND_MDB2=1; + static private $preparedQueries = array(); + /** * @var MDB2_Driver_Common */ @@ -121,6 +123,7 @@ class OC_DB { return true; } } + self::$preparedQueries = array(); // The global data we need $name = OC_Config::getValue( "dbname", "owncloud" ); $host = OC_Config::getValue( "dbhost", "" ); @@ -201,6 +204,7 @@ class OC_DB { return true; } } + self::$preparedQueries = array(); // The global data we need $name = OC_Config::getValue( "dbname", "owncloud" ); $host = OC_Config::getValue( "dbhost", "" ); @@ -321,7 +325,12 @@ class OC_DB { $query.=$limitsql; } } + } else { + if (isset(self::$preparedQueries[$query])) { + return self::$preparedQueries[$query]; + } } + $rawQuery = $query; // Optimize the query $query = self::processQuery( $query ); @@ -343,6 +352,9 @@ class OC_DB { } $result=new PDOStatementWrapper($result); } + if (is_null($limit) || $limit == -1) { + self::$preparedQueries[$rawQuery] = $result; + } return $result; } @@ -588,7 +600,7 @@ class OC_DB { error_log('DB error: '.$entry); OC_Template::printErrorPage( $entry ); } - + if($result->numRows() == 0) { $query = 'INSERT INTO "' . $table . '" ("' . implode('","', array_keys($input)) . '") VALUES("' @@ -623,7 +635,7 @@ class OC_DB { return $result->execute(); } - + /** * @brief does minor changes to query * @param string $query Query string diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index c333efa6cdf..7e0f631c8fb 100644 --- a/lib/fileproxy/quota.php +++ b/lib/fileproxy/quota.php @@ -78,7 +78,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{ $usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0; return $totalSpace-$usedSpace; } - + public function postFree_space($path, $space) { $free=$this->getFreeSpace($path); if($free==-1) { diff --git a/lib/files.php b/lib/files.php index e1a31c6f033..4d09946a23f 100644 --- a/lib/files.php +++ b/lib/files.php @@ -45,7 +45,7 @@ class OC_Files { */ public static function get($dir, $files, $only_header = false) { $xsendfile = false; - if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) || + if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) || isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) { $xsendfile = true; } diff --git a/lib/helper.php b/lib/helper.php index 7aede047974..6b1eaa4e6ee 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -223,6 +223,10 @@ class OC_Helper { * Makes 2048 to 2 kB. */ public static function humanFileSize( $bytes ) { + if( $bytes < 0 ) { + $l = OC_L10N::get('lib'); + return $l->t("couldn't be determined"); + } if( $bytes < 1024 ) { return "$bytes B"; } @@ -549,7 +553,7 @@ class OC_Helper { fclose($fh); return $file; } - + /** * create a temporary folder with an unique filename * @return string diff --git a/lib/image.php b/lib/image.php index 26ea43ed29c..eaa35350bcb 100644 --- a/lib/image.php +++ b/lib/image.php @@ -646,7 +646,7 @@ class OC_Image { fclose($fh); return $im; } - + /** * @brief Resizes the image preserving ratio. * @param $maxsize The maximum size of either the width or height. diff --git a/lib/json.php b/lib/json.php index c87de3e200b..f929e958957 100644 --- a/lib/json.php +++ b/lib/json.php @@ -74,7 +74,7 @@ class OC_JSON{ exit(); } } - + /** * Send json error msg */ diff --git a/lib/l10n.php b/lib/l10n.php index f70dfa5e34e..ca53b3cf65c 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -141,15 +141,15 @@ class OC_L10N{ } } - /** - * @brief Translating - * @param $text String The text we need a translation for - * @param array $parameters default:array() Parameters for sprintf - * @return \OC_L10N_String Translation or the same text - * - * Returns the translation. If no translation is found, $text will be - * returned. - */ + /** + * @brief Translating + * @param $text String The text we need a translation for + * @param array $parameters default:array() Parameters for sprintf + * @return \OC_L10N_String Translation or the same text + * + * Returns the translation. If no translation is found, $text will be + * returned. + */ public function t($text, $parameters = array()) { return new OC_L10N_String($this, $text, $parameters); } diff --git a/lib/log.php b/lib/log.php index e9cededa5c0..e869282e88c 100644 --- a/lib/log.php +++ b/lib/log.php @@ -39,7 +39,7 @@ class OC_Log { $log_class::write($app, $message, $level); } } - + //Fatal errors handler public static function onShutdown() { $error = error_get_last(); @@ -50,7 +50,7 @@ class OC_Log { return true; } } - + // Uncaught exception handler public static function onException($exception) { self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL); diff --git a/lib/migrate.php b/lib/migrate.php index 62ab00bc332..87bdd016fe4 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -655,7 +655,7 @@ class OC_Migrate{ $query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" ); $result = $query->execute( array( $uid, $hash)); if( !$result ) { - OC_Log::write('migration', 'Failed to create the new user "'.$uid.""); + OC_Log::write('migration', 'Failed to create the new user "'.$uid."", OC_Log::ERROR); } return $result ? true : false; diff --git a/lib/migration/content.php b/lib/migration/content.php index 00df62f0c7f..e81c8f217ff 100644 --- a/lib/migration/content.php +++ b/lib/migration/content.php @@ -66,7 +66,7 @@ class OC_Migration_Content{ // Die if we have an error (error means: bad query, not 0 results!) if( PEAR::isError( $query ) ) { - $entry = 'DB Error: "'.$result->getMessage().'"<br />'; + $entry = 'DB Error: "'.$query->getMessage().'"<br />'; $entry .= 'Offending command was: '.$query.'<br />'; OC_Log::write( 'migration', $entry, OC_Log::FATAL ); return false; diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 7c29061c324..179ed8f3107 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -24,7 +24,7 @@ class OC_OCS_Cloud { - public static function getSystemWebApps($parameters) { + public static function getSystemWebApps() { OC_Util::checkLoggedIn(); $apps = OC_App::getEnabledApps(); $values = array(); @@ -37,7 +37,7 @@ class OC_OCS_Cloud { } return new OC_OCS_Result($values); } - + public static function getUserQuota($parameters) { $user = OC_User::getUser(); if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) { @@ -68,7 +68,7 @@ class OC_OCS_Cloud { return new OC_OCS_Result(null, 300); } } - + public static function getUserPublickey($parameters) { if(OC_User::userExists($parameters['user'])) { @@ -79,7 +79,7 @@ class OC_OCS_Cloud { return new OC_OCS_Result(null, 300); } } - + public static function getUserPrivatekey($parameters) { $user = OC_User::getUser(); if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) { diff --git a/lib/ocs/config.php b/lib/ocs/config.php index 03c54aa2314..f19121f4b2b 100644 --- a/lib/ocs/config.php +++ b/lib/ocs/config.php @@ -23,7 +23,7 @@ */ class OC_OCS_Config { - + public static function apiConfig($parameters) { $xml['version'] = '1.7'; $xml['website'] = 'ownCloud'; @@ -32,5 +32,5 @@ class OC_OCS_Config { $xml['ssl'] = 'false'; return new OC_OCS_Result($xml); } - + } diff --git a/lib/ocs/person.php b/lib/ocs/person.php index 169cc8211db..1c8210d0825 100644 --- a/lib/ocs/person.php +++ b/lib/ocs/person.php @@ -38,5 +38,5 @@ class OC_OCS_Person { return new OC_OCS_Result(null, 101); } } - + } diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php index e01ed5e8b07..311b24269dd 100644 --- a/lib/ocs/privatedata.php +++ b/lib/ocs/privatedata.php @@ -39,7 +39,7 @@ class OC_OCS_Privatedata { return new OC_OCS_Result($xml); //TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it } - + public static function set($parameters) { OC_Util::checkLoggedIn(); $user = OC_User::getUser(); @@ -50,7 +50,7 @@ class OC_OCS_Privatedata { return new OC_OCS_Result(null, 100); } } - + public static function delete($parameters) { OC_Util::checkLoggedIn(); $user = OC_User::getUser(); diff --git a/lib/ocs/result.php b/lib/ocs/result.php index b08d911f785..65b2067fc3f 100644 --- a/lib/ocs/result.php +++ b/lib/ocs/result.php @@ -21,9 +21,9 @@ */ class OC_OCS_Result{ - + private $data, $message, $statusCode, $items, $perPage; - + /** * create the OCS_Result object * @param $data mixed the data to return @@ -33,7 +33,7 @@ class OC_OCS_Result{ $this->statusCode = $code; $this->message = $message; } - + /** * optionally set the total number of items available * @param $items int @@ -41,7 +41,7 @@ class OC_OCS_Result{ public function setTotalItems(int $items) { $this->items = $items; } - + /** * optionally set the the number of items per page * @param $items int @@ -49,7 +49,7 @@ class OC_OCS_Result{ public function setItemsPerPage(int $items) { $this->perPage = $items; } - + /** * returns the data associated with the api result * @return array @@ -70,6 +70,6 @@ class OC_OCS_Result{ // Return the result data. return $return; } - - + + }
\ No newline at end of file diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 24081425f1e..ca0665da436 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -39,11 +39,11 @@ class OC_OCSClient{ return($url); } - /** - * @brief Get the url of the OCS KB server. - * @returns string of the KB server - * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default - */ + /** + * @brief Get the url of the OCS KB server. + * @returns string of the KB server + * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default + */ private static function getKBURL() { $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1'); return($url); @@ -59,7 +59,7 @@ class OC_OCSClient{ return($data); } - /** + /** * @brief Get all the categories from the OCS server * @returns array with category ids * @note returns NULL if config value appstoreenabled is set to false @@ -242,7 +242,7 @@ class OC_OCSClient{ } $kbe['totalitems'] = $data->meta->totalitems; } - return $kbe; + return $kbe; } diff --git a/lib/public/api.php b/lib/public/api.php index a85daa1935c..95d333f2165 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -26,7 +26,7 @@ namespace OCP; * This class provides functions to manage apps in ownCloud */ class API { - + /** * registers an api call * @param string $method the http method @@ -40,5 +40,5 @@ class API { public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){ \OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements); } - + } diff --git a/lib/public/app.php b/lib/public/app.php index 809a656f17f..a1ecf524cc8 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -89,7 +89,7 @@ class App { * @param $page string page to be included */ public static function registerPersonal( $app, $page ) { - return \OC_App::registerPersonal( $app, $page ); + \OC_App::registerPersonal( $app, $page ); } /** @@ -98,7 +98,7 @@ class App { * @param $page string page to be included */ public static function registerAdmin( $app, $page ) { - return \OC_App::registerAdmin( $app, $page ); + \OC_App::registerAdmin( $app, $page ); } /** @@ -125,10 +125,9 @@ class App { /** * @brief Check if the app is enabled, redirects to home if not * @param $app app - * @returns true/false */ public static function checkAppEnabled( $app ) { - return \OC_Util::checkAppEnabled( $app ); + \OC_Util::checkAppEnabled( $app ); } /** diff --git a/lib/public/constants.php b/lib/public/constants.php index bc979c9031f..1495c620dc9 100644 --- a/lib/public/constants.php +++ b/lib/public/constants.php @@ -35,4 +35,3 @@ const PERMISSION_UPDATE = 2; const PERMISSION_DELETE = 8; const PERMISSION_SHARE = 16; const PERMISSION_ALL = 31; - diff --git a/lib/public/db.php b/lib/public/db.php index 5d4aadd22ae..932e79d9ef1 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -49,9 +49,9 @@ class DB { * @brief Insert a row if a matching row doesn't exists. * @param $table string The table name (will replace *PREFIX*) to perform the replace on. * @param $input array - * + * * The input array if in the form: - * + * * array ( 'id' => array ( 'value' => 6, * 'key' => true * ), @@ -65,7 +65,7 @@ class DB { public static function insertIfNotExist($table, $input) { return(\OC_DB::insertIfNotExist($table, $input)); } - + /** * @brief gets last value of autoincrement * @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix diff --git a/lib/public/files.php b/lib/public/files.php index 2d6775e01f1..f6b3e0ee38a 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -38,9 +38,10 @@ class Files { * @brief Recusive deletion of folders * @param string $dir path to the folder * + * @return bool */ static function rmdirr( $dir ) { - \OC_Helper::rmdirr( $dir ); + return \OC_Helper::rmdirr( $dir ); } /** diff --git a/lib/public/response.php b/lib/public/response.php index bfb84eda5d1..de0c3f25347 100644 --- a/lib/public/response.php +++ b/lib/public/response.php @@ -42,7 +42,7 @@ class Response { * null cache indefinitly */ static public function enableCaching( $cache_time = null ) { - return(\OC_Response::enableCaching( $cache_time )); + \OC_Response::enableCaching( $cache_time ); } /** @@ -51,7 +51,7 @@ class Response { * @param string $lastModified time when the reponse was last modified */ static public function setLastModifiedHeader( $lastModified ) { - return(\OC_Response::setLastModifiedHeader( $lastModified )); + \OC_Response::setLastModifiedHeader( $lastModified ); } /** @@ -59,7 +59,7 @@ class Response { * @see enableCaching with cache_time = 0 */ static public function disableCaching() { - return(\OC_Response::disableCaching()); + \OC_Response::disableCaching(); } /** @@ -68,7 +68,7 @@ class Response { * @param string $etag token to use for modification check */ static public function setETagHeader( $etag ) { - return(\OC_Response::setETagHeader( $etag )); + \OC_Response::setETagHeader( $etag ); } /** @@ -76,7 +76,7 @@ class Response { * @param string $filepath of file to send */ static public function sendFile( $filepath ) { - return(\OC_Response::sendFile( $filepath )); + \OC_Response::sendFile( $filepath ); } /** @@ -86,7 +86,7 @@ class Response { * DateTime object when to expire response */ static public function setExpiresHeader( $expires ) { - return(\OC_Response::setExpiresHeader( $expires )); + \OC_Response::setExpiresHeader( $expires ); } /** @@ -94,6 +94,6 @@ class Response { * @param string $location to redirect to */ static public function redirect( $location ) { - return(\OC_Response::redirect( $location )); + \OC_Response::redirect( $location ); } } diff --git a/lib/public/share.php b/lib/public/share.php index 7722e0b86cc..9d2a64b4590 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -248,14 +248,14 @@ class Share { //delete the old share self::delete($checkExists['id']); } - + // Generate hash of password - same method as user passwords if (isset($shareWith)) { $forcePortable = (CRYPT_BLOWFISH != 1); $hasher = new \PasswordHash(8, $forcePortable); $shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', '')); } - + // Generate token if (isset($oldToken)) { $token = $oldToken; @@ -305,7 +305,9 @@ class Share { if ($parentFolder && $files = \OC\Files\Filesystem::getDirectoryContent($itemSource)) { for ($i = 0; $i < count($files); $i++) { $name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource)); - if ($files[$i]['mimetype'] == 'httpd/unix-directory' && $children = \OC\Files\Filesystem::getDirectoryContent($name, '/')) { + if ($files[$i]['mimetype'] == 'httpd/unix-directory' + && $children = \OC\Files\Filesystem::getDirectoryContent($name, '/') + ) { // Continue scanning into child folders array_push($files, $children); } else { @@ -681,8 +683,14 @@ class Share { } } else { if ($fileDependent) { - if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_GET_FOLDER_CONTENTS || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, `name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`'; + if (($itemType == 'file' || $itemType == 'folder') + && $format == \OC_Share_Backend_File::FORMAT_FILE_APP + || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT + ) { + $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, ' + .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, ' + .'`expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, ' + .'`versioned`, `writable`'; } else { $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`'; } diff --git a/lib/public/user.php b/lib/public/user.php index 9e50115ab70..204d8e4c0f1 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -65,7 +65,7 @@ class User { /** * @brief check if a user exists * @param string $uid the username - * @param string $excludingBackend (default none) + * @param string $excludingBackend (default none) * @return boolean */ public static function userExists( $uid, $excludingBackend = null ) { @@ -73,12 +73,10 @@ class User { } /** * @brief Loggs the user out including all the session data - * @returns true - * * Logout, destroys session */ public static function logout() { - return \OC_USER::logout(); + \OC_USER::logout(); } /** diff --git a/lib/public/util.php b/lib/public/util.php index df09ea81ae1..8197482c0dd 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -203,7 +203,7 @@ class Util { $host_name = self::getServerHostName(); // handle localhost installations if ($host_name === 'localhost') { - $host_name = "example.com"; + $host_name = "example.com"; } return $user_part.'@'.$host_name; } @@ -298,7 +298,7 @@ class Util { * Todo: Write howto */ public static function callCheck() { - return(\OC_Util::callCheck()); + \OC_Util::callCheck(); } /** diff --git a/lib/request.php b/lib/request.php index 99a77e1b59e..f2f15c21103 100755 --- a/lib/request.php +++ b/lib/request.php @@ -19,7 +19,7 @@ class OC_Request { return 'localhost'; } if(OC_Config::getValue('overwritehost', '')<>'') { - return OC_Config::getValue('overwritehost'); + return OC_Config::getValue('overwritehost'); } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) { @@ -44,7 +44,7 @@ class OC_Request { */ public static function serverProtocol() { if(OC_Config::getValue('overwriteprotocol', '')<>'') { - return OC_Config::getValue('overwriteprotocol'); + return OC_Config::getValue('overwriteprotocol'); } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { $proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']); diff --git a/lib/setup.php b/lib/setup.php index fdd10be6824..b88bc4b52ce 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -153,7 +153,7 @@ class OC_Setup { if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { self::createHtaccess(); } - + //and we are done OC_Config::setValue('installed', true); } diff --git a/lib/template.php b/lib/template.php index 04667d73a2c..f7124ebc09c 100644 --- a/lib/template.php +++ b/lib/template.php @@ -85,15 +85,25 @@ function human_file_size( $bytes ) { } function simple_file_size($bytes) { - $mbytes = round($bytes/(1024*1024), 1); - if($bytes == 0) { return '0'; } - else if($mbytes < 0.1) { return '< 0.1'; } - else if($mbytes > 1000) { return '> 1000'; } - else { return number_format($mbytes, 1); } + if ($bytes < 0) { + return '?'; + } + $mbytes = round($bytes / (1024 * 1024), 1); + if ($bytes == 0) { + return '0'; + } + if ($mbytes < 0.1) { + return '< 0.1'; + } + if ($mbytes > 1000) { + return '> 1000'; + } else { + return number_format($mbytes, 1); + } } function relative_modified_date($timestamp) { - $l=OC_L10N::get('lib'); + $l=OC_L10N::get('lib'); $timediff = time() - $timestamp; $diffminutes = round($timediff/60); $diffhours = round($diffminutes/60); diff --git a/lib/user.php b/lib/user.php index 8d4eb7aec4d..fd0ed6ecd3a 100644 --- a/lib/user.php +++ b/lib/user.php @@ -260,17 +260,13 @@ class OC_User { /** * @brief Sets user id for session and triggers emit - * @returns true - * */ public static function setUserId($uid) { $_SESSION['user_id'] = $uid; - return true; } /** * @brief Logs the current user out and kills all the session data - * @returns true * * Logout, destroys session */ @@ -279,7 +275,6 @@ class OC_User { session_unset(); session_destroy(); OC_User::unsetMagicInCookie(); - return true; } /** diff --git a/lib/vcategories.php b/lib/vcategories.php index 406a4eb1074..1700870f91f 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -763,4 +763,3 @@ class OC_VCategories { return array_search(strtolower($needle), array_map('strtolower', $haystack)); } } - diff --git a/ocs/routes.php b/ocs/routes.php index d77b96fc145..d6ee589df6f 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -17,4 +17,4 @@ OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Private OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH); -?> + diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index 548dc2e209b..9bba9c5269d 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -31,8 +31,8 @@ $action = "add"; // Toggle group if( OC_Group::inGroup( $username, $group )) { $action = "remove"; - $error = $l->t("Unable to remove user from group %s", $group); - $success = OC_Group::removeFromGroup( $username, $group ); + $error = $l->t("Unable to remove user from group %s", $group); + $success = OC_Group::removeFromGroup( $username, $group ); $usersInGroup=OC_Group::usersInGroup($group); if(count($usersInGroup)==0) { OC_Group::deleteGroup($group); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 5ee0147fbcb..0097489743f 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -10,13 +10,13 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); // is htaccess working ? if (!$_['htaccessworking']) { - ?> + ?> <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> + <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> <span class="securitywarning"> - <?php echo $l->t('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.'); ?> - </span> + <?php echo $l->t('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.'); ?> + </span> </fieldset> <?php @@ -24,13 +24,13 @@ if (!$_['htaccessworking']) { // is locale working ? if (!$_['islocaleworking']) { - ?> + ?> <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Locale not working');?></strong></legend> + <legend><strong><?php echo $l->t('Locale not working');?></strong></legend> - <span class="connectionwarning"> - <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". 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 en_US.UTF-8.'); ?> - </span> + <span class="connectionwarning"> + <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". 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 en_US.UTF-8.'); ?> + </span> </fieldset> <?php @@ -38,13 +38,13 @@ if (!$_['islocaleworking']) { // is internet connection working ? if (!$_['internetconnectionworking']) { - ?> + ?> <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend> + <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend> - <span class="connectionwarning"> - <?php echo $l->t('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.'); ?> - </span> + <span class="connectionwarning"> + <?php echo $l->t('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.'); ?> + </span> </fieldset> <?php @@ -52,152 +52,152 @@ if (!$_['internetconnectionworking']) { ?> <?php foreach ($_['forms'] as $form) { - echo $form; + echo $form; } ;?> <fieldset class="personalblock" id="backgroundjobs"> - <legend><strong><?php echo $l->t('Cron');?></strong></legend> - <table class="nostyle"> - <tr> - <td> - <input type="radio" name="mode" value="ajax" - id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") { - echo 'checked="checked"'; - } ?>> - <label for="backgroundjobs_ajax">AJAX</label><br/> - <em><?php echo $l->t("Execute one task with each page loaded"); ?></em> - </td> - </tr> - <tr> - <td> - <input type="radio" name="mode" value="webcron" - id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") { - echo 'checked="checked"'; - } ?>> - <label for="backgroundjobs_webcron">Webcron</label><br/> - <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em> - </td> - </tr> - <tr> - <td> - <input type="radio" name="mode" value="cron" - id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") { - echo 'checked="checked"'; - } ?>> - <label for="backgroundjobs_cron">Cron</label><br/> - <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em> - </td> - </tr> - </table> + <legend><strong><?php echo $l->t('Cron');?></strong></legend> + <table class="nostyle"> + <tr> + <td> + <input type="radio" name="mode" value="ajax" + id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") { + echo 'checked="checked"'; + } ?>> + <label for="backgroundjobs_ajax">AJAX</label><br/> + <em><?php echo $l->t("Execute one task with each page loaded"); ?></em> + </td> + </tr> + <tr> + <td> + <input type="radio" name="mode" value="webcron" + id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") { + echo 'checked="checked"'; + } ?>> + <label for="backgroundjobs_webcron">Webcron</label><br/> + <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em> + </td> + </tr> + <tr> + <td> + <input type="radio" name="mode" value="cron" + id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") { + echo 'checked="checked"'; + } ?>> + <label for="backgroundjobs_cron">Cron</label><br/> + <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em> + </td> + </tr> + </table> </fieldset> <fieldset class="personalblock" id="shareAPI"> - <legend><strong><?php echo $l->t('Sharing');?></strong></legend> - <table class="shareAPI nostyle"> - <tr> - <td id="enable"> - <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" - value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> /> - <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/> - <em><?php echo $l->t('Allow apps to use the Share API'); ?></em> - </td> - </tr> - <tr> - <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>> - <input type="checkbox" name="shareapi_allow_links" id="allowLinks" - value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> /> - <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/> - <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em> - </td> - </tr> - <tr> - <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>> - <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" - value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> /> - <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/> - <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em> - </td> - </tr> - <tr> - <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>> - <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" - value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> /> - <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/> - <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" - value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> /> - <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/> - </td> - </tr> - </table> + <legend><strong><?php echo $l->t('Sharing');?></strong></legend> + <table class="shareAPI nostyle"> + <tr> + <td id="enable"> + <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" + value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> /> + <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/> + <em><?php echo $l->t('Allow apps to use the Share API'); ?></em> + </td> + </tr> + <tr> + <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>> + <input type="checkbox" name="shareapi_allow_links" id="allowLinks" + value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> /> + <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/> + <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em> + </td> + </tr> + <tr> + <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>> + <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" + value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> /> + <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/> + <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em> + </td> + </tr> + <tr> + <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>> + <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" + value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> /> + <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/> + <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" + value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> /> + <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/> + </td> + </tr> + </table> </fieldset> <fieldset class="personalblock" id="security"> - <legend><strong><?php echo $l->t('Security');?></strong></legend> - <table class="nostyle"> - <tr> - <td id="enable"> - <input type="checkbox" name="forcessl" id="enforceHTTPSEnabled" - <?php if ($_['enforceHTTPSEnabled']) { - echo 'checked="checked" '; - echo 'value="false"'; - } else { - echo 'value="true"'; - } - ?> - <?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> /> - <label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/> - <em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em> - <?php if (!$_['isConnectedViaHTTPS']) { - echo "<br/><em>"; - echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'); - echo "</em>"; - } - ?> - </td> - </tr> - </table> + <legend><strong><?php echo $l->t('Security');?></strong></legend> + <table class="nostyle"> + <tr> + <td id="enable"> + <input type="checkbox" name="forcessl" id="enforceHTTPSEnabled" + <?php if ($_['enforceHTTPSEnabled']) { + echo 'checked="checked" '; + echo 'value="false"'; + } else { + echo 'value="true"'; + } + ?> + <?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> /> + <label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/> + <em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em> + <?php if (!$_['isConnectedViaHTTPS']) { + echo "<br/><em>"; + echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'); + echo "</em>"; + } + ?> + </td> + </tr> + </table> </fieldset> <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Log');?></strong></legend> - <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'> - <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option> - <?php for ($i = 0; $i < 5; $i++): - if ($i != $_['loglevel']):?> - <option value='<?php echo $i?>'><?php echo $levels[$i]?></option> - <?php endif; + <legend><strong><?php echo $l->t('Log');?></strong></legend> + <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'> + <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option> + <?php for ($i = 0; $i < 5; $i++): + if ($i != $_['loglevel']):?> + <option value='<?php echo $i?>'><?php echo $levels[$i]?></option> + <?php endif; endfor;?> </select> - <table id='log'> - <?php foreach ($_['entries'] as $entry): ?> - <tr> - <td> - <?php echo $levels[$entry->level];?> - </td> - <td> - <?php echo $entry->app;?> - </td> - <td> - <?php echo $entry->message;?> - </td> - <td> - <?php echo OC_Util::formatDate($entry->time);?> - </td> - </tr> - <?php endforeach;?> - </table> - <?php if ($_['entriesremain']): ?> - <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input> - <?php endif; ?> + <table id='log'> + <?php foreach ($_['entries'] as $entry): ?> + <tr> + <td> + <?php echo $levels[$entry->level];?> + </td> + <td> + <?php echo $entry->app;?> + </td> + <td> + <?php echo $entry->message;?> + </td> + <td> + <?php echo OC_Util::formatDate($entry->time);?> + </td> + </tr> + <?php endforeach;?> + </table> + <?php if ($_['entriesremain']): ?> + <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'> + <?php endif; ?> </fieldset> <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Version');?></strong></legend> - <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> - (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/> - <?php echo $l->t('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>.'); ?> + <legend><strong><?php echo $l->t('Version');?></strong></legend> + <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> + (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/> + <?php echo $l->t('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>.'); ?> </fieldset> diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 179ce9c5405..0490f63fb67 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -29,7 +29,7 @@ <p class="description"></p> <img src="" class="preview" /> <p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p> - <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p> + <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p> <input class="enable hidden" type="submit" /> </div> </div> diff --git a/settings/templates/help.php b/settings/templates/help.php index b697905f7ef..8f51cd87017 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,14 +1,14 @@ <div id="controls"> - <?php if($_['admin']) { ?> + <?php if($_['admin']) { ?> <a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a> - <a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a> + <a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a> <?php } ?> - <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a> - <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a> - <?php if($_['admin']) { ?> + <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a> + <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a> + <?php if($_['admin']) { ?> <a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a> <?php } ?> - <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a> + <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a> </div> <br /><br /> <iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe> @@ -18,14 +18,14 @@ <!-- function pageY(elem) { - return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop; + return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop; } var buffer = 5; //scroll bar buffer function resizeIframe() { - var height = document.documentElement.clientHeight; - height -= pageY(document.getElementById('ifm'))+ buffer ; - height = (height < 0) ? 0 : height; - document.getElementById('ifm').style.height = height + 'px'; + var height = document.documentElement.clientHeight; + height -= pageY(document.getElementById('ifm'))+ buffer ; + height = (height < 0) ? 0 : height; + document.getElementById('ifm').style.height = height + 'px'; } document.getElementById('ifm').onload=resizeIframe; diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 35eb0ef5e9a..0e1677bdea8 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -62,7 +62,7 @@ <fieldset class="personalblock"> <legend><strong><?php echo $l->t('Version');?></strong></legend> <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br /> - <?php echo $l->t('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>.'); ?> + <?php echo $l->t('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>.'); ?> </fieldset> diff --git a/settings/templates/users.php b/settings/templates/users.php index e8bf9edf604..6cbbca24049 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -36,11 +36,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>; <div class="quota-select-wrapper"> <?php if((bool) $_['isadmin']): ?> <select class='quota'> - <option - <?php if($_['default_quota']=='none') echo 'selected="selected"';?> - value='none'> - <?php echo $l->t('Unlimited');?> - </option> + <option + <?php if($_['default_quota']=='none') echo 'selected="selected"';?> + value='none'> + <?php echo $l->t('Unlimited');?> + </option> <?php foreach($_['quota_preset'] as $preset):?> <?php if($preset!='default'):?> <option @@ -127,16 +127,16 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>; <td class="quota"> <div class="quota-select-wrapper"> <select class='quota-user'> - <option - <?php if($user['quota']=='default') echo 'selected="selected"';?> - value='default'> - <?php echo $l->t('Default');?> - </option> - <option - <?php if($user['quota']=='none') echo 'selected="selected"';?> - value='none'> - <?php echo $l->t('Unlimited');?> - </option> + <option + <?php if($user['quota']=='default') echo 'selected="selected"';?> + value='default'> + <?php echo $l->t('Default');?> + </option> + <option + <?php if($user['quota']=='none') echo 'selected="selected"';?> + value='none'> + <?php echo $l->t('Unlimited');?> + </option> <?php foreach($_['quota_preset'] as $preset):?> <option <?php if($user['quota']==$preset) echo 'selected="selected"';?> diff --git a/settings/users.php b/settings/users.php index 1a32a7ecb5b..668d974693a 100644 --- a/settings/users.php +++ b/settings/users.php @@ -18,7 +18,9 @@ OC_App::setActiveNavigationEntry( 'core_users' ); $users = array(); $groups = array(); -if(OC_User::isAdminUser(OC_User::getUser())) { +$isadmin = OC_User::isAdminUser(OC_User::getUser()); + +if($isadmin) { $accessiblegroups = OC_Group::getGroups(); $accessibleusers = OC_User::getUsers('', 30); $subadmins = OC_SubAdmin::getAllSubAdmins(); @@ -32,7 +34,7 @@ if(OC_User::isAdminUser(OC_User::getUser())) { $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'); $quotaPreset=explode(',', $quotaPreset); foreach($quotaPreset as &$preset) { - $preset=trim($preset); + $preset=trim($preset); } $quotaPreset=array_diff($quotaPreset, array('default', 'none')); @@ -41,14 +43,14 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && // load users and quota foreach($accessibleusers as $i) { - $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default'); - $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false; + $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default'); + $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false; $users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/), - 'quota'=>$quota, - 'isQuotaUserDefined'=>$isQuotaUserDefined, + 'quota'=>$quota, + 'isQuotaUserDefined'=>$isQuotaUserDefined, 'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i))); } diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php index 2e3808e2d92..744d4608420 100644 --- a/tests/lib/files/storage/commontest.php +++ b/tests/lib/files/storage/commontest.php @@ -39,5 +39,3 @@ class CommonTest extends Storage { \OC_Helper::rmdirr($this->tmpDir); } } - -?> diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php index 6672368e676..1aad138aa33 100644 --- a/tests/lib/files/storage/local.php +++ b/tests/lib/files/storage/local.php @@ -36,3 +36,4 @@ class Local extends Storage { \OC_Helper::rmdirr($this->tmpDir); } } + |