diff options
191 files changed, 4540 insertions, 3320 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 57c8c15c197..6532b76df21 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -10,7 +10,7 @@ OCP\JSON::callCheck(); $dir = stripslashes($_POST["dir"]); $files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]); -$files = explode(';', $files); +$files = json_decode($files); $filesWithError = ''; $success = true; //Now delete diff --git a/apps/files/download.php b/apps/files/download.php index 6475afb56e0..e2149cd4135 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -40,7 +40,12 @@ if(!OC_Filesystem::file_exists($filename)) { $ftype=OC_Filesystem::getMimeType( $filename ); header('Content-Type:'.$ftype); -header('Content-Disposition: attachment; filename="'.basename($filename).'"'); +if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) { + header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' ); +} else { + header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) ) + . '; filename="' . rawurlencode( basename($filename) ) . '"' ); +} OCP\Response::disableCaching(); header('Content-Length: '.OC_Filesystem::filesize($filename)); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9f0bafafbdf..96dd0323d29 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -288,7 +288,7 @@ var FileList={ }, finishDelete:function(ready,sync){ if(!FileList.deleteCanceled && FileList.deleteFiles){ - var fileNames=FileList.deleteFiles.join(';'); + var fileNames=JSON.stringify(FileList.deleteFiles); $.ajax({ url: OC.filePath('files', 'ajax', 'delete.php'), async:!sync, diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index 562755f55b7..cc2b5d42139 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -127,6 +127,9 @@ var Files = Files || {}; } Files.bindKeyboardShortcuts = function(document, $) { $(document).keydown(function(event) { //check for modifier keys + if(!$(event.target).is('body')) { + return; + } var preventDefault = false; if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode); if ( diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index c47fdbdbf4f..1d22746156e 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -1,21 +1,44 @@ <?php $TRANSLATIONS = array( "There is no error, the file uploaded with success" => "Нема грешка, датотеката беше подигната успешно", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата", "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.", "No file was uploaded" => "Не беше подигната датотека", "Missing a temporary folder" => "Не постои привремена папка", "Failed to write to disk" => "Неуспеав да запишам на диск", "Files" => "Датотеки", +"Unshare" => "Не споделувај", "Delete" => "Избриши", +"Rename" => "Преименувај", +"{new_name} already exists" => "{new_name} веќе постои", +"replace" => "замени", +"suggest name" => "предложи име", +"cancel" => "откажи", +"replaced {new_name}" => "земенета {new_name}", +"undo" => "врати", +"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}", +"unshared {files}" => "без споделување {files}", +"deleted {files}" => "избришани {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.", "generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.", "Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти", "Upload Error" => "Грешка при преземање", "Close" => "Затвои", "Pending" => "Чека", +"1 file uploading" => "1 датотека се подига", +"{count} files uploading" => "{count} датотеки се подигаат", "Upload cancelled." => "Преземањето е прекинато.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud", +"{count} files scanned" => "{count} датотеки скенирани", +"error while scanning" => "грешка при скенирање", "Name" => "Име", "Size" => "Големина", "Modified" => "Променето", +"1 folder" => "1 папка", +"{count} folders" => "{count} папки", +"1 file" => "1 датотека", +"{count} files" => "{count} датотеки", "File handling" => "Ракување со датотеки", "Maximum upload size" => "Максимална големина за подигање", "max. possible: " => "макс. можно:", @@ -27,6 +50,7 @@ "New" => "Ново", "Text file" => "Текстуална датотека", "Folder" => "Папка", +"From link" => "Од врска", "Upload" => "Подигни", "Cancel upload" => "Откажи прикачување", "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php index 5a6c032ed96..bb701aac002 100644 --- a/apps/files/l10n/ru_RU.php +++ b/apps/files/l10n/ru_RU.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( "There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного", "The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично", "No file was uploaded" => "Файл не был загружен", diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 66fec4cd536..0de12edcba5 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -15,11 +15,11 @@ <input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>" - <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /> - <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br /> + <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br /> + <em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br /> <input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" /> <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/> </fieldset> -</form>
\ No newline at end of file +</form> diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php new file mode 100644 index 00000000000..dfcaed9f37e --- /dev/null +++ b/apps/files_encryption/l10n/mk.php @@ -0,0 +1,6 @@ +<?php $TRANSLATIONS = array( +"Encryption" => "Енкрипција", +"Exclude the following file types from encryption" => "Исклучи ги следните типови на датотеки од енкрипција", +"None" => "Ништо", +"Enable Encryption" => "Овозможи енкрипција" +); diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php index 6b2b03211e2..94ff5ab94ba 100644 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +OC_Util::checkAdminUser(); + $tmpl = new OCP\Template( 'files_encryption', 'settings'); $blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', @@ -17,4 +19,4 @@ $tmpl->assign('encryption_enabled', $enabled); OCP\Util::addscript('files_encryption', 'settings'); OCP\Util::addscript('core', 'multiselect'); -return $tmpl->fetchPage();
\ No newline at end of file +return $tmpl->fetchPage(); diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php index 75df784e397..268b1a80ccd 100644 --- a/apps/files_encryption/templates/settings.php +++ b/apps/files_encryption/templates/settings.php @@ -1,14 +1,14 @@ <form id="calendar"> <fieldset class="personalblock"> - <strong><?php echo $l->t('Encryption'); ?></strong> - <?php echo $l->t('Exclude the following file types from encryption'); ?> + <legend><strong><?php echo $l->t('Encryption');?></strong></legend> + <input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?> + id='enable_encryption' ></input> + <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): ?> <option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option> <?php endforeach;?> - </select> - <input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?> - id='enable_encryption' ></input> - <label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label> + </select><br /> + <?php echo $l->t('Exclude the following file types from encryption'); ?> </fieldset> </form> diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php index 5d57e5e4598..196b3af2038 100644 --- a/apps/files_external/l10n/de.php +++ b/apps/files_external/l10n/de.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Bitte alle notwendigen Felder füllen", "Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.", "Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht aktiv oder nicht installiert. Das Einhängen von FTP-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren.", "External Storage" => "Externer Speicher", "Mount point" => "Mount-Point", "Backend" => "Backend", diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php index 357968bd462..fb969006d66 100644 --- a/apps/files_external/l10n/de_DE.php +++ b/apps/files_external/l10n/de_DE.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Bitte alle notwendigen Felder füllen", "Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.", "Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Achtung:</b> \"smbclient\" ist nicht installiert. Das Laden von CIFS/SMB shares ist nicht möglich. Bitte wenden Sie sich an Ihren Systemadministrator.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Achtung:</b> Die FTP Unterstützung von PHP ist nicht initialisiert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.", "External Storage" => "Externer Speicher", "Mount point" => "Mount-Point", "Backend" => "Backend", diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php index 8fde4fcde0f..597623323b0 100644 --- a/apps/files_external/l10n/mk.php +++ b/apps/files_external/l10n/mk.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"Backend" => "Админ", "Groups" => "Групи", "Users" => "Корисници", "Delete" => "Избриши" diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php index 4795a51a6b7..06dbc0cf6bd 100644 --- a/apps/files_external/l10n/pt_PT.php +++ b/apps/files_external/l10n/pt_PT.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Preencha todos os campos obrigatórios", "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.", "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.", "External Storage" => "Armazenamento Externo", "Mount point" => "Ponto de montagem", "Backend" => "Backend", diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php index 493e3f5bee4..05a784100c2 100644 --- a/apps/files_external/l10n/ru_RU.php +++ b/apps/files_external/l10n/ru_RU.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Заполните все требуемые поля", "Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.", "Error configuring Google Drive storage" => "Ошибка настройки хранилища Google Drive", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> \"smbclient\" не установлен. Mounting of CIFS/SMB shares is not possible. Пожалуйста, обратитесь к системному администратору, чтобы установить его.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.", "External Storage" => "Внешние системы хранения данных", "Mount point" => "Точка монтирования", "Backend" => "Бэкэнд", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index 713e89578e2..f0db66ded96 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Zapolni vsa zahtevana polja", "Please provide a valid Dropbox app key and secret." => "Vpišite veljaven ključ programa in kodo za Dropbox", "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči.", "External Storage" => "Zunanja podatkovna shramba", "Mount point" => "Priklopna točka", "Backend" => "Zaledje", diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index c0864dc50d2..1be544fbc07 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -331,7 +331,7 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) { $content .= "\t\t'".$group."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; + $content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; } $content .= "\t\t),\n"; @@ -343,7 +343,7 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) { $content .= "\t\t'".$user."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; + $content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; } $content .= "\t\t),\n"; } diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php index 509c2977622..4215b28787e 100755 --- a/apps/files_external/personal.php +++ b/apps/files_external/personal.php @@ -29,6 +29,6 @@ $tmpl = new OCP\Template('files_external', 'settings'); $tmpl->assign('isAdminPage', false, false); $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints()); $tmpl->assign('certs', OC_Mount_Config::getCertificates()); -$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false); +$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false); $tmpl->assign('backends', $backends); return $tmpl->fetchPage(); diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index 94222149a38..cd0bfa99585 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -20,6 +20,8 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ +OC_Util::checkAdminUser(); + OCP\Util::addScript('files_external', 'settings'); OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min'); OCP\Util::addStyle('files_external', 'settings'); @@ -30,6 +32,6 @@ $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints()); $tmpl->assign('backends', OC_Mount_Config::getBackends()); $tmpl->assign('groups', OC_Group::getGroups()); $tmpl->assign('users', OCP\User::getUsers()); -$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false); +$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false); $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes')); return $tmpl->fetchPage(); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 50f4a16a5ab..dd537d779a6 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -127,19 +127,14 @@ </fieldset> </form> +<?php if ( ! $_['isAdminPage']): ?> <form id="files_external" method="post" enctype="multipart/form-data" action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>"> <fieldset class="personalblock"> -<?php if ( ! $_['isAdminPage']): ?> + <legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend> <table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'> - <thead> - <tr> - <th><?php echo $l->t('SSL root certificates'); ?></th> - <th> </th> - </tr> - </thead> <tbody width="100%"> <?php foreach ($_['certs'] as $rootCert): ?> <tr id="<?php echo $rootCert ?>"> @@ -156,6 +151,6 @@ </table> <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;"> <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" /> - <?php endif; ?> </fieldset> </form> +<?php endif; ?> diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php new file mode 100644 index 00000000000..16c7ee0eb04 --- /dev/null +++ b/apps/files_sharing/l10n/mk.php @@ -0,0 +1,9 @@ +<?php $TRANSLATIONS = array( +"Password" => "Лозинка", +"Submit" => "Прати", +"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас", +"%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас", +"Download" => "Преземи", +"No preview available for" => "Нема достапно преглед за", +"web services under your control" => "веб сервиси под Ваша контрола" +); diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 71c18380a3b..fef0ed8a8c2 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -160,7 +160,7 @@ if ($linkItem) { exit(); } } - $basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files')); + $basePath = substr($pathAndUser['path'], strlen('/'.$fileOwner.'/files')); $path = $basePath; if (isset($_GET['path'])) { $path .= $_GET['path']; diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 599d302e6e4..afc0a67edba 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -10,7 +10,7 @@ OCP\App::registerPersonal('files_versions', 'settings-personal'); OCP\Util::addscript('files_versions', 'versions'); // Listen to write signals -OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook"); +OCP\Util::connectHook('OC_Filesystem', 'write', "OCA_Versions\Hooks", "write_hook"); // Listen to delete and rename signals OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook"); OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook");
\ No newline at end of file diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index deff735cedc..d4c278ebd85 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -33,7 +33,7 @@ if ( isset( $_GET['path'] ) ) { $versions = new OCA_Versions\Storage(); // roll back to old version if button clicked - if( isset( $_GET['revert'] ) ) { + if( isset( $_GET['revert'] ) ) { if( $versions->rollback( $path, $_GET['revert'] ) ) { @@ -52,7 +52,7 @@ if ( isset( $_GET['path'] ) ) { } // show the history only if there is something to show - if( OCA_Versions\Storage::isversioned( $path ) ) { + if( OCA_Versions\Storage::isversioned( $path ) ) { $count = 999; //show the newest revisions $versions = OCA_Versions\Storage::getVersions( $path, $count); diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php new file mode 100644 index 00000000000..60a06ad3384 --- /dev/null +++ b/apps/files_versions/l10n/mk.php @@ -0,0 +1,8 @@ +<?php $TRANSLATIONS = array( +"Expire all versions" => "Истечи ги сите верзии", +"History" => "Историја", +"Versions" => "Версии", +"This will delete all existing backup versions of your files" => "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки", +"Files Versioning" => "Верзии на датотеки", +"Enable" => "Овозможи" +); diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php index 854d032da62..cc5a494f19e 100644 --- a/apps/files_versions/templates/history.php +++ b/apps/files_versions/templates/history.php @@ -23,7 +23,9 @@ if( isset( $_['message'] ) ) { echo ' '; echo OCP\Util::formatDate( doubleval($v['version']) ); echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />'; - if ( $v['cur'] ) { echo ' (<b>Current</b>)'; } + if ( $v['cur'] ) { + echo ' (<b>Current</b>)'; + } echo '<br /><br />'; } diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php index 6d97cea46c3..2b313a07c88 100644 --- a/apps/files_versions/templates/settings-personal.php +++ b/apps/files_versions/templates/settings-personal.php @@ -3,12 +3,10 @@ <legend> <strong><?php echo $l->t('Versions'); ?></strong> </legend> - <p> - <?php echo $l->t('This will delete all existing backup versions of your files'); ?> - </p> <button id="expireAllBtn"> <?php echo $l->t('Expire all versions'); ?> <img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /> - </button> + </button> + <br /><em><?php echo $l->t('This will delete all existing backup versions of your files'); ?></em> </fieldset> </form> diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php index be72912040d..d801ddff631 100644 --- a/apps/user_ldap/l10n/ca.php +++ b/apps/user_ldap/l10n/ca.php @@ -1,4 +1,6 @@ <?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 c90dc9ed568..0c14ebb9d1e 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -1,4 +1,6 @@ <?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 97debcbab60..bcd8ccfe343 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -1,4 +1,6 @@ <?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 Apps user_ldap und user_webdavauth sind nicht kompatible. Unerwartetes Verhalten kann auftreten. Bitte Deinen System-Verwalter eine von beiden zu de-aktivieren.", +"<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 System-Administrator 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/es.php b/apps/user_ldap/l10n/es.php index c89ceb8eee2..4931af79eaf 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -1,4 +1,6 @@ <?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/it.php b/apps/user_ldap/l10n/it.php index f07f0aa5a42..915ce3af5b8 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -1,4 +1,6 @@ <?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 ffaae4e9bd2..c7b2a0f91b8 100644 --- a/apps/user_ldap/l10n/ja_JP.php +++ b/apps/user_ldap/l10n/ja_JP.php @@ -1,4 +1,6 @@ <?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/mk.php b/apps/user_ldap/l10n/mk.php new file mode 100644 index 00000000000..f0a348b7421 --- /dev/null +++ b/apps/user_ldap/l10n/mk.php @@ -0,0 +1,3 @@ +<?php $TRANSLATIONS = array( +"Password" => "Лозинка" +); diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php index 7ebebe1e073..0a3dea14c94 100644 --- a/apps/user_ldap/l10n/pl.php +++ b/apps/user_ldap/l10n/pl.php @@ -1,4 +1,6 @@ <?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 a17e1a95923..1b21b899a2e 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -1,4 +1,6 @@ <?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/ru.php b/apps/user_ldap/l10n/ru.php index 92982d868b8..f41a0b05838 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -1,4 +1,6 @@ <?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 d5adb9fffd3..09d7899249a 100644 --- a/apps/user_ldap/l10n/ru_RU.php +++ b/apps/user_ldap/l10n/ru_RU.php @@ -1,4 +1,6 @@ <?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 098224bb319..1d1fc33a83b 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -1,4 +1,6 @@ <?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 2a0abb92967..e8e14af7aca 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -1,4 +1,6 @@ <?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 1bbd24f679b..f82e9f2a420 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -1,4 +1,6 @@ <?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/lib/access.php b/apps/user_ldap/lib/access.php index 00183ac181b..f888577aedb 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -133,7 +133,7 @@ abstract class Access { '\"' => '\5c22', '\#' => '\5c23', ); - $dn = str_replace(array_keys($replacements),array_values($replacements), $dn); + $dn = str_replace(array_keys($replacements), array_values($replacements), $dn); return $dn; } @@ -347,20 +347,20 @@ abstract class Access { } private function findMappedGroup($dn) { - static $query = null; + static $query = null; if(is_null($query)) { $query = \OCP\DB::prepare(' - SELECT `owncloud_name` - FROM `'.$this->getMapTable(false).'` - WHERE `ldap_dn` = ?' - ); - } - $res = $query->execute(array($dn))->fetchOne(); - if($res) { - return $res; - } + SELECT `owncloud_name` + FROM `'.$this->getMapTable(false).'` + WHERE `ldap_dn` = ?' + ); + } + $res = $query->execute(array($dn))->fetchOne(); + if($res) { + return $res; + } return false; - } + } private function ldap2ownCloudNames($ldapObjects, $isUsers) { @@ -619,7 +619,7 @@ abstract class Access { //a) paged search insuccessful, though attempted //b) no paged search, but limit set if((!$this->pagedSearchedSuccessful - && $pagedSearchOK) + && $pagedSearchOK) || ( !$pagedSearchOK && !is_null($limit) diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 687e2692270..b14cdafff89 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -338,11 +338,11 @@ class Connection { } $this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']); if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) { - if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) { - if($this->config['ldapTLS']) { - ldap_start_tls($this->ldapConnectionRes); - } + if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) { + if($this->config['ldapTLS']) { + ldap_start_tls($this->ldapConnectionRes); } + } } return $this->bind(); diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index 2ee936d29a8..58ec8e7f7a4 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -20,6 +20,9 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ + +OC_Util::checkAdminUser(); + $params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl', 'home_folder_naming_rule'); OCP\Util::addscript('user_ldap', 'settings'); diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php index 497a3385caa..41d7fa51cd2 100755 --- a/apps/user_webdavauth/settings.php +++ b/apps/user_webdavauth/settings.php @@ -21,11 +21,13 @@ * */ +OC_Util::checkAdminUser(); + if($_POST) { - if(isset($_POST['webdav_url'])) { - OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url'])); - } + if(isset($_POST['webdav_url'])) { + OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url'])); + } } // fill template diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php index e6ca5d97d3c..62ed45fd278 100755 --- a/apps/user_webdavauth/templates/settings.php +++ b/apps/user_webdavauth/templates/settings.php @@ -1,7 +1,8 @@ <form id="webdavauth" action="#" method="post"> <fieldset class="personalblock"> <legend><strong>WebDAV Authentication</strong></legend> - <p><label for="webdav_url"><?php echo $l->t('WebDAV URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label> + <p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label> <input type="submit" value="Save" /> + <br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?> </fieldset> </form> diff --git a/core/ajax/share.php b/core/ajax/share.php index 12206e0fd79..72ffc52e997 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -89,12 +89,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if ($type === 'dir') $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link)); - // handle localhost installations - $server_host = OCP\Util::getServerHost(); - if ($server_host === 'localhost') - $server_host = "example.com"; - $default_from = 'sharing-noreply@' . $server_host; + $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply'); $from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from ); // send it out now diff --git a/core/doc/admin/index.php b/core/doc/admin/index.php new file mode 100644 index 00000000000..7785f2ce2f1 --- /dev/null +++ b/core/doc/admin/index.php @@ -0,0 +1,2 @@ +Here goes the admin documentation. +In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a> diff --git a/core/doc/user/index.php b/core/doc/user/index.php new file mode 100644 index 00000000000..ede62f05aee --- /dev/null +++ b/core/doc/user/index.php @@ -0,0 +1,2 @@ +Here goes the user documentation +In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a> diff --git a/core/js/share.js b/core/js/share.js index df5ebf008b4..bb3ec010ff5 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -161,9 +161,9 @@ OC.Share={ if (link) { html += '<div id="link">'; html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>'; - html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>'; html += '<br />'; html += '<input id="linkText" type="text" readonly="readonly" />'; + html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>'; html += '<div id="linkPass">'; html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '</div>'; @@ -347,9 +347,12 @@ OC.Share={ } $('#linkText').val(link); $('#linkText').show('blind'); + $('#linkText').css('display','block'); $('#showPassword').show(); + $('#showPassword+label').show(); if (password != null) { $('#linkPass').show('blind'); + $('#showPassword').attr('checked', true); $('#linkPassText').attr('placeholder', t('core', 'Password protected')); } $('#expiration').show(); @@ -359,6 +362,7 @@ OC.Share={ hideLink:function() { $('#linkText').hide('blind'); $('#showPassword').hide(); + $('#showPassword+label').hide(); $('#linkPass').hide(); $('#emailPrivateLink #email').hide(); $('#emailPrivateLink #emailButton').hide(); @@ -518,16 +522,25 @@ $(document).ready(function() { $('#showPassword').live('click', function() { $('#linkPass').toggle('blind'); + if (!$('#showPassword').is(':checked') ) { + var itemType = $('#dropdown').data('item-type'); + var itemSource = $('#dropdown').data('item-source'); + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ); + } else { + $('#linkPassText').focus(); + } }); - $('#linkPassText').live('focusout', function(event) { - var itemType = $('#dropdown').data('item-type'); - var itemSource = $('#dropdown').data('item-source'); - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() { - $('#linkPassText').val(''); - $('#linkPassText').attr('placeholder', t('core', 'Password protected')); - }); - $('#linkPassText').attr('placeholder', t('core', 'Password protected')); + $('#linkPassText').live('focusout keyup', function(event) { + if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) { + var itemType = $('#dropdown').data('item-type'); + var itemSource = $('#dropdown').data('item-source'); + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() { + console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type); + $('#linkPassText').val(''); + $('#linkPassText').attr('placeholder', t('core', 'Password protected')); + }); + } }); $('#expirationCheckbox').live('click', function() { diff --git a/core/l10n/de.php b/core/l10n/de.php index 50c17ed46ae..08a120763a3 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "%s möchte eine Datei mit dir teilen", +"User %s shared a folder with you" => "%s möchte ein Verzeichnis mit dir teilen", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s möchte die Datei %s mit dir teilen. Sie liegt hier zum Download bereit: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s möchte das Verzeichnis %s mit dir teilen. Es liegt hier zum Download bereit: %s", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: " => "Kategorie existiert bereits:", @@ -39,6 +43,8 @@ "Share with link" => "Über einen Link freigeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", +"Email link to person" => "Link per E-Mail verschicken", +"Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", "Expiration date" => "Ablaufdatum", "Share via email:" => "Über eine E-Mail freigeben:", @@ -55,6 +61,8 @@ "Password protected" => "Durch ein Passwort geschützt", "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", +"Sending ..." => "Sende ...", +"Email sent" => "E-Mail wurde verschickt", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}", "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 51c0eaaf0f9..e32068f6db2 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Der Nutzer %s teilt eine Datei mit dir", +"User %s shared a folder with you" => "Der Nutzer %s teilt einen Ordner mit dir", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: " => "Kategorie existiert bereits:", @@ -39,6 +43,8 @@ "Share with link" => "Über einen Link freigeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", +"Email link to person" => "Link per Mail an Person schicken", +"Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", "Expiration date" => "Ablaufdatum", "Share via email:" => "Mittels einer E-Mail freigeben:", @@ -55,6 +61,8 @@ "Password protected" => "Durch ein Passwort geschützt", "Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", +"Sending ..." => "Sende ...", +"Email sent" => "Email gesendet", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", diff --git a/core/l10n/es.php b/core/l10n/es.php index 58693eda8bd..2a9f5682dfb 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "El usuario %s ha compartido un archivo contigo", +"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s", "Category type not provided." => "Tipo de categoria no proporcionado.", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: " => "Esta categoría ya existe: ", @@ -39,6 +43,8 @@ "Share with link" => "Compartir con enlace", "Password protect" => "Protegido por contraseña", "Password" => "Contraseña", +"Email link to person" => "Enviar un enlace por correo electrónico a una persona", +"Send" => "Enviar", "Set expiration date" => "Establecer fecha de caducidad", "Expiration date" => "Fecha de caducidad", "Share via email:" => "compartido via e-mail:", @@ -55,6 +61,8 @@ "Password protected" => "Protegido por contraseña", "Error unsetting expiration date" => "Error al eliminar la fecha de caducidad", "Error setting expiration date" => "Error estableciendo fecha de caducidad", +"Sending ..." => "Enviando...", +"Email sent" => "Correo electrónico enviado", "ownCloud password reset" => "Reiniciar contraseña de ownCloud", "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}", "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 252b0369e55..4b4a23b8c70 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -30,6 +30,8 @@ "Share with link" => "Jaa linkillä", "Password protect" => "Suojaa salasanalla", "Password" => "Salasana", +"Email link to person" => "Lähetä linkki sähköpostitse", +"Send" => "Lähetä", "Set expiration date" => "Aseta päättymispäivä", "Expiration date" => "Päättymispäivä", "Share via email:" => "Jaa sähköpostilla:", @@ -45,6 +47,8 @@ "Password protected" => "Salasanasuojattu", "Error unsetting expiration date" => "Virhe purettaessa eräpäivää", "Error setting expiration date" => "Virhe päättymispäivää asettaessa", +"Sending ..." => "Lähetetään...", +"Email sent" => "Sähköposti lähetetty", "ownCloud password reset" => "ownCloud-salasanan nollaus", "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}", "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.", diff --git a/core/l10n/he.php b/core/l10n/he.php index d4ec0ab84c4..50addbd5278 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "המשתמש %s שיתף אתך קובץ", +"User %s shared a folder with you" => "המשתמש %s שיתף אתך תיקייה", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s", "Category type not provided." => "סוג הקטגוריה לא סופק.", "No category to add?" => "אין קטגוריה להוספה?", "This category already exists: " => "קטגוריה זאת כבר קיימת: ", @@ -39,6 +43,8 @@ "Share with link" => "שיתוף עם קישור", "Password protect" => "הגנה בססמה", "Password" => "ססמה", +"Email link to person" => "שליחת קישור בדוא״ל למשתמש", +"Send" => "שליחה", "Set expiration date" => "הגדרת תאריך תפוגה", "Expiration date" => "תאריך התפוגה", "Share via email:" => "שיתוף באמצעות דוא״ל:", @@ -55,6 +61,8 @@ "Password protected" => "מוגן בססמה", "Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה", "Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה", +"Sending ..." => "מתבצעת שליחה ...", +"Email sent" => "הודעת הדוא״ל נשלחה", "ownCloud password reset" => "איפוס הססמה של ownCloud", "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}", "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.", diff --git a/core/l10n/it.php b/core/l10n/it.php index 0db292df597..e97deb9fb5f 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -43,6 +43,7 @@ "Share with link" => "Condividi con collegamento", "Password protect" => "Proteggi con password", "Password" => "Password", +"Email link to person" => "Invia collegamento via email", "Send" => "Invia", "Set expiration date" => "Imposta data di scadenza", "Expiration date" => "Data di scadenza", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 72b5915701b..72615d36f62 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "ユーザ %s はあなたとファイルを共有しています", +"User %s shared a folder with you" => "ユーザ %s はあなたとフォルダを共有しています", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s", "Category type not provided." => "カテゴリタイプは提供されていません。", "No category to add?" => "追加するカテゴリはありませんか？", "This category already exists: " => "このカテゴリはすでに存在します: ", @@ -39,6 +43,8 @@ "Share with link" => "URLリンクで共有", "Password protect" => "パスワード保護", "Password" => "パスワード", +"Email link to person" => "メールリンク", +"Send" => "送信", "Set expiration date" => "有効期限を設定", "Expiration date" => "有効期限", "Share via email:" => "メール経由で共有:", @@ -55,6 +61,8 @@ "Password protected" => "パスワード保護", "Error unsetting expiration date" => "有効期限の未設定エラー", "Error setting expiration date" => "有効期限の設定でエラー発生", +"Sending ..." => "送信中...", +"Email sent" => "メールを送信しました", "ownCloud password reset" => "ownCloudのパスワードをリセットします", "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}", "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 251abb015f9..401baf6efa0 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -1,18 +1,73 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Корисникот %s сподели датотека со Вас", +"User %s shared a folder with you" => "Корисникот %s сподели папка со Вас", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s", +"Category type not provided." => "Не беше доставен тип на категорија.", "No category to add?" => "Нема категорија да се додаде?", "This category already exists: " => "Оваа категорија веќе постои:", +"Object type not provided." => "Не беше доставен тип на објект.", +"%s ID not provided." => "%s ID не беше доставено.", +"Error adding %s to favorites." => "Грешка при додавање %s во омилени.", "No categories selected for deletion." => "Не е одбрана категорија за бришење.", +"Error removing %s from favorites." => "Грешка при бришење на %s од омилени.", "Settings" => "Поставки", +"seconds ago" => "пред секунди", +"1 minute ago" => "пред 1 минута", +"{minutes} minutes ago" => "пред {minutes} минути", +"1 hour ago" => "пред 1 час", +"{hours} hours ago" => "пред {hours} часови", +"today" => "денеска", +"yesterday" => "вчера", +"{days} days ago" => "пред {days} денови", +"last month" => "минатиот месец", +"{months} months ago" => "пред {months} месеци", +"months ago" => "пред месеци", +"last year" => "минатата година", +"years ago" => "пред години", +"Choose" => "Избери", "Cancel" => "Откажи", "No" => "Не", "Yes" => "Да", "Ok" => "Во ред", +"The object type is not specified." => "Не е специфициран типот на објект.", "Error" => "Грешка", +"The app name is not specified." => "Името на апликацијата не е специфицирано.", +"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!", +"Error while sharing" => "Грешка при споделување", +"Error while unsharing" => "Грешка при прекин на споделување", +"Error while changing permissions" => "Грешка при промена на привилегии", +"Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}", +"Shared with you by {owner}" => "Споделено со Вас од {owner}", +"Share with" => "Сподели со", +"Share with link" => "Сподели со врска", +"Password protect" => "Заштити со лозинка", "Password" => "Лозинка", +"Email link to person" => "Прати врска по е-пошта на личност", +"Send" => "Прати", +"Set expiration date" => "Постави рок на траење", +"Expiration date" => "Рок на траење", +"Share via email:" => "Сподели по е-пошта:", +"No people found" => "Не се најдени луѓе", +"Resharing is not allowed" => "Повторно споделување не е дозволено", +"Shared in {item} with {user}" => "Споделено во {item} со {user}", +"Unshare" => "Не споделувај", +"can edit" => "може да се измени", +"access control" => "контрола на пристап", "create" => "креирај", +"update" => "ажурирај", +"delete" => "избриши", +"share" => "сподели", +"Password protected" => "Заштитено со лозинка", +"Error unsetting expiration date" => "Грешка при тргање на рокот на траење", +"Error setting expiration date" => "Грешка при поставување на рок на траење", +"Sending ..." => "Праќање...", +"Email sent" => "Е-порака пратена", "ownCloud password reset" => "ресетирање на лозинка за ownCloud", "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}", "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.", +"Reset email send." => "Порката за ресетирање на лозинка пратена.", +"Request failed!" => "Барањето не успеа!", "Username" => "Корисничко име", "Request reset" => "Побарајте ресетирање", "Your password was reset" => "Вашата лозинка беше ресетирана", @@ -28,6 +83,10 @@ "Cloud not found" => "Облакот не е најден", "Edit categories" => "Уреди категории", "Add" => "Додади", +"Security Warning" => "Безбедносно предупредување", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ", +"Your data directory and 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." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.", "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>", "Advanced" => "Напредно", "Data folder" => "Фолдер со податоци", @@ -36,6 +95,7 @@ "Database user" => "Корисник на база", "Database password" => "Лозинка на база", "Database name" => "Име на база", +"Database tablespace" => "Табела во базата на податоци", "Database host" => "Сервер со база", "Finish setup" => "Заврши го подесувањето", "Sunday" => "Недела", @@ -59,10 +119,16 @@ "December" => "Декември", "web services under your control" => "веб сервиси под Ваша контрола", "Log out" => "Одјава", +"Automatic logon rejected!" => "Одбиена автоматска најава!", +"If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана", +"Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.", "Lost your password?" => "Ја заборавивте лозинката?", "remember" => "запамти", "Log in" => "Најава", "You are logged out." => "Одјавени сте.", "prev" => "претходно", -"next" => "следно" +"next" => "следно", +"Security Warning!" => "Безбедносно предупредување.", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.", +"Verify" => "Потврди" ); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index b780e546194..1208aec5a53 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Użytkownik %s współdzieli plik z tobą", +"User %s shared a folder with you" => "Uzytkownik %s wspóldzieli folder z toba", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s", "Category type not provided." => "Typ kategorii nie podany.", "No category to add?" => "Brak kategorii", "This category already exists: " => "Ta kategoria już istnieje", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 24017d39819..a2bfcf4f882 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "O utilizador %s partilhou um ficheiro consigo.", +"User %s shared a folder with you" => "O utilizador %s partilhou uma pasta consigo.", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s", "Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", "This category already exists: " => "Esta categoria já existe:", @@ -39,6 +43,8 @@ "Share with link" => "Partilhar com link", "Password protect" => "Proteger com palavra-passe", "Password" => "Palavra chave", +"Email link to person" => "Enviar o link por e-mail", +"Send" => "Enviar", "Set expiration date" => "Especificar data de expiração", "Expiration date" => "Data de expiração", "Share via email:" => "Partilhar via email:", @@ -55,6 +61,8 @@ "Password protected" => "Protegido com palavra-passe", "Error unsetting expiration date" => "Erro ao retirar a data de expiração", "Error setting expiration date" => "Erro ao aplicar a data de expiração", +"Sending ..." => "A Enviar...", +"Email sent" => "E-mail enviado com sucesso!", "ownCloud password reset" => "Reposição da password ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}", "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password", diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php index 7dea4062809..3d67179c14e 100644 --- a/core/l10n/ru_RU.php +++ b/core/l10n/ru_RU.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Пользователь %s открыл Вам доступ к файлу", +"User %s shared a folder with you" => "Пользователь %s открыл Вам доступ к папке", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s", "Category type not provided." => "Тип категории не предоставлен.", "No category to add?" => "Нет категории для добавления?", "This category already exists: " => "Эта категория уже существует:", @@ -39,6 +43,7 @@ "Share with link" => "Опубликовать с ссылкой", "Password protect" => "Защитить паролем", "Password" => "Пароль", +"Send" => "Отправить", "Set expiration date" => "Установить срок действия", "Expiration date" => "Дата истечения срока действия", "Share via email:" => "Сделать общедоступным посредством email:", @@ -55,6 +60,8 @@ "Password protected" => "Пароль защищен", "Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия", "Error setting expiration date" => "Ошибка при установке даты истечения срока действия", +"Sending ..." => "Отправка ...", +"Email sent" => "Письмо отправлено", "ownCloud password reset" => "Переназначение пароля", "Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}", "You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 2aa4193263d..0ee2eb03b3c 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami", +"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s", "Category type not provided." => "Vrsta kategorije ni podana.", "No category to add?" => "Ni kategorije za dodajanje?", "This category already exists: " => "Ta kategorija že obstaja:", @@ -39,6 +43,8 @@ "Share with link" => "Omogoči souporabo s povezavo", "Password protect" => "Zaščiti z geslom", "Password" => "Geslo", +"Email link to person" => "Posreduj povezavo po e-pošti", +"Send" => "Pošlji", "Set expiration date" => "Nastavi datum preteka", "Expiration date" => "Datum preteka", "Share via email:" => "Souporaba preko elektronske pošte:", @@ -55,6 +61,8 @@ "Password protected" => "Zaščiteno z geslom", "Error unsetting expiration date" => "Napaka brisanja datuma preteka", "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka", +"Sending ..." => "Pošiljam ...", +"Email sent" => "E-pošta je bila poslana", "ownCloud password reset" => "Ponastavitev gesla ownCloud", "Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}", "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 523520dc754..e64b16d3b83 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -43,7 +43,7 @@ class OC_Core_LostPassword_Controller { $tmpl->assign('link', $link, false); $msg = $tmpl->fetchPage(); $l = OC_L10N::get('core'); - $from = 'lostpassword-noreply@' . OCP\Util::getServerHost(); + $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); echo('Mailsent'); diff --git a/core/templates/logout.php b/core/templates/logout.php index 8cbbdd9cc8d..2247ed8e70f 100644 --- a/core/templates/logout.php +++ b/core/templates/logout.php @@ -1 +1 @@ -<?php echo $l->t( 'You are logged out.' ); ?>
\ No newline at end of file +<?php echo $l->t( 'You are logged out.' ); diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po index 51ea5c8216f..6a78dcfd054 100644 --- a/l10n/ar/user_ldap.po +++ b/l10n/ar/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po index 23f9ad3829b..7d102e98bdf 100644 --- a/l10n/bg_BG/user_ldap.po +++ b/l10n/bg_BG/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: bg_BG\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po index 78f5bcc2ccd..10b45cc3214 100644 --- a/l10n/ca/user_ldap.po +++ b/l10n/ca/user_ldap.po @@ -8,164 +8,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-29 13:55+0000\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" "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" "Content-Transfer-Encoding: 8bit\n" "Language: ca\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Màquina" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN Base" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN Usuari" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Contrasenya" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtre d'inici de sessió d'usuari" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Llista de filtres d'usuari" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Defineix el filtre a aplicar quan es mostren usuaris" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtre de grup" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Defineix el filtre a aplicar quan es mostren grups." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Arbre base d'usuaris" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Arbre base de grups" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Associació membres-grup" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usa TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "No ho useu en connexions SSL, fallarà." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Desactiva la validació de certificat SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "No recomanat, ús només per proves." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Camp per mostrar el nom d'usuari" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Camp per mostrar el nom del grup" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "en bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "en segons. Un canvi buidarà la memòria de cau." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ajuda" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 808367304a8..89d650bf77d 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/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-09-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 13:37+0000\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" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -20,153 +20,166 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Počítač" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Základní DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Uživatelské DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Heslo" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtr přihlášení uživatelů" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtr uživatelských seznamů" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Určuje použitý filtr, pro získávaní uživatelů." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "bez zástupných znaků, např. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtr skupin" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Určuje použitý filtr, pro získávaní skupin." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Základní uživatelský strom" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Základní skupinový strom" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociace člena skupiny" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Použít TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP server nerozlišující velikost znaků (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Vypnout ověřování SSL certifikátu." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Není doporučeno, pouze pro testovací účely." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Pole pro zobrazované jméno uživatele" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Pole pro zobrazení jména skupiny" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "v bajtech" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Nápověda" diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index 95a083e9f1e..00ec233a6eb 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/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-10-24 02:02+0200\n" -"PO-Revision-Date: 2012-10-23 09:31+0000\n" -"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -21,153 +21,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Base DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Bruger DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Kodeord" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Brug TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Anbefales ikke, brug kun for at teste." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Hjælp" diff --git a/l10n/de/core.po b/l10n/de/core.po index fa82ef3b2e6..4d2fac3a45e 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -7,6 +7,7 @@ # <alex.hotz@gmail.com>, 2011. # <blobbyjj@ymail.com>, 2012. # <georg.stefan.germany@googlemail.com>, 2011. +# I Robot <owncloud-bot@tmit.eu>, 2012. # I Robot <thomas.mueller@tmit.eu>, 2012. # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. # <mail@felixmoeller.de>, 2012. @@ -15,15 +16,16 @@ # <m.fresel@sysangels.com>, 2012. # <niko@nik-o-mat.de>, 2012. # Phi Lieb <>, 2012. +# Susi <>, 2012. # <thomas.mueller@tmit.eu>, 2012. # <transifex.3.mensaje@spamgourmet.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 08:06+0000\n" +"Last-Translator: Susi <>\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,26 +36,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "%s möchte eine Datei mit dir teilen" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "%s möchte ein Verzeichnis mit dir teilen" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "%s möchte die Datei %s mit dir teilen. Sie liegt hier zum Download bereit: %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 "%s möchte das Verzeichnis %s mit dir teilen. Es liegt hier zum Download bereit: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -175,8 +177,8 @@ msgid "The object type is not specified." msgstr "Der Objekttyp ist nicht angegeben." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Fehler" @@ -188,7 +190,7 @@ msgstr "Der App-Name ist nicht angegeben." msgid "The required file {file} is not installed!" msgstr "Die benötigte Datei {file} ist nicht installiert." -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Fehler beim Freigeben" @@ -216,22 +218,22 @@ msgstr "Freigeben für" msgid "Share with link" msgstr "Über einen Link freigeben" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Passwortschutz" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Passwort" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Link per E-Mail verschicken" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Senden" #: js/share.js:177 msgid "Set expiration date" @@ -285,25 +287,25 @@ msgstr "löschen" msgid "share" msgstr "freigeben" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "Durch ein Passwort geschützt" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "Fehler beim entfernen des Ablaufdatums" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "Fehler beim Setzen des Ablaufdatums" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Sende ..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "E-Mail wurde verschickt" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -325,8 +327,8 @@ msgstr "Die E-Mail zum Zurücksetzen wurde versendet." msgid "Request failed!" msgstr "Die Anfrage schlug fehl!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Benutzername" @@ -415,44 +417,44 @@ msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus msgid "Create an <strong>admin account</strong>" msgstr "<strong>Administrator-Konto</strong> anlegen" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Fortgeschritten" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Datenverzeichnis" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Datenbank einrichten" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "wird verwendet" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Datenbank-Benutzer" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Datenbank-Passwort" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Datenbank-Name" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Datenbank-Tablespace" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Datenbank-Host" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Installation abschließen" @@ -558,11 +560,11 @@ msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen." msgid "Lost your password?" msgstr "Passwort vergessen?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "merken" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Einloggen" diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po index 1d52174a221..42d733228c9 100644 --- a/l10n/de/files_external.po +++ b/l10n/de/files_external.po @@ -4,6 +4,7 @@ # # Translators: # <blobbyjj@ymail.com>, 2012. +# I Robot <owncloud-bot@tmit.eu>, 2012. # I Robot <thomas.mueller@tmit.eu>, 2012. # <thomas.mueller@tmit.eu>, 2012. # <transifex.3.mensaje@spamgourmet.com>, 2012. @@ -11,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" +"POT-Creation-Date: 2012-12-16 00:11+0100\n" +"PO-Revision-Date: 2012-12-15 19:35+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" @@ -49,14 +50,14 @@ msgstr "Fehler beim Einrichten von Google Drive" msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren." #: lib/config.php:435 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "" +msgstr "<b>Warnung:</b> \"smbclient\" ist nicht aktiv oder nicht installiert. Das Einhängen von FTP-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 71044b0d502..2d9cbf3b697 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -4,18 +4,20 @@ # # Translators: # <blobbyjj@ymail.com>, 2012. +# I Robot <owncloud-bot@tmit.eu>, 2012. # I Robot <thomas.mueller@tmit.eu>, 2012. # Maurice Preuß <>, 2012. # <niko@nik-o-mat.de>, 2012. # Phi Lieb <>, 2012. +# Susi <>, 2012. # <transifex.3.mensaje@spamgourmet.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-02 23:16+0200\n" -"PO-Revision-Date: 2012-10-02 09:13+0000\n" -"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 08:19+0000\n" +"Last-Translator: Susi <>\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" @@ -24,153 +26,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Warnung:</b> Die Apps user_ldap und user_webdavauth sind nicht kompatible. Unerwartetes Verhalten kann auftreten. Bitte Deinen System-Verwalter eine von beiden zu de-aktivieren." + +#: 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 System-Administrator das Modul zu installieren." + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Basis-DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Benutzer-DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Passwort" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Benutzer-Login-Filter" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Benutzer-Filter-Liste" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiert den Filter für die Anfrage der Benutzer." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=person\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Gruppen-Filter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiert den Filter für die Anfrage der Gruppen." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Basis-Benutzerbaum" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Nutze TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Schalte die SSL-Zertifikatsprüfung aus." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Nicht empfohlen, nur zu Testzwecken." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Feld für den Anzeigenamen des Benutzers" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. " -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Feld für den Anzeigenamen der Gruppe" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. " -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "in Bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "in Sekunden. Eine Änderung leert den Cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Hilfe" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index f106dc2fb2a..faa7f085445 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -7,6 +7,7 @@ # <alex.hotz@gmail.com>, 2011. # <a.tangemann@web.de>, 2012. # <blobbyjj@ymail.com>, 2012. +# <deh3nne@deviantdev.com>, 2012. # <georg.stefan.germany@googlemail.com>, 2011. # I Robot <thomas.mueller@tmit.eu>, 2012. # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. @@ -21,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 12:15+0000\n" +"Last-Translator: deh3nne <deh3nne@deviantdev.com>\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" @@ -34,26 +35,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Der Nutzer %s teilt eine Datei mit dir" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Der Nutzer %s teilt einen Ordner mit dir" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %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 "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -220,18 +221,18 @@ msgstr "Über einen Link freigeben" msgid "Password protect" msgstr "Passwortschutz" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Passwort" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Link per Mail an Person schicken" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Senden" #: js/share.js:177 msgid "Set expiration date" @@ -299,11 +300,11 @@ msgstr "Fehler beim Setzen des Ablaufdatums" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "Sende ..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "Email gesendet" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -325,8 +326,8 @@ msgstr "E-Mail zum Zurücksetzen des Passworts gesendet." msgid "Request failed!" msgstr "Die Anfrage schlug fehl!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Benutzername" @@ -415,44 +416,44 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte msgid "Create an <strong>admin account</strong>" msgstr "<strong>Administrator-Konto</strong> anlegen" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Fortgeschritten" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Datenverzeichnis" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Datenbank einrichten" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "wird verwendet" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Datenbank-Benutzer" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Datenbank-Passwort" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Datenbank-Name" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Datenbank-Tablespace" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Datenbank-Host" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Installation abschließen" @@ -558,11 +559,11 @@ msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern." msgid "Lost your password?" msgstr "Passwort vergessen?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "merken" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Einloggen" diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po index 321c2a78ef5..1b603f1ee39 100644 --- a/l10n/de_DE/files_external.po +++ b/l10n/de_DE/files_external.po @@ -4,6 +4,7 @@ # # Translators: # <blobbyjj@ymail.com>, 2012. +# <deh3nne@deviantdev.com>, 2012. # I Robot <thomas.mueller@tmit.eu>, 2012. # <thomas.mueller@tmit.eu>, 2012. # <transifex.3.mensaje@spamgourmet.com>, 2012. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 11:52+0000\n" +"Last-Translator: deh3nne <deh3nne@deviantdev.com>\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" @@ -49,14 +50,14 @@ msgstr "Fehler beim Einrichten von Google Drive" msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Achtung:</b> \"smbclient\" ist nicht installiert. Das Laden von CIFS/SMB shares ist nicht möglich. Bitte wenden Sie sich an Ihren Systemadministrator." #: lib/config.php:435 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "" +msgstr "<b>Achtung:</b> Die FTP Unterstützung von PHP ist nicht initialisiert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 430a4290235..8e59bdac23d 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/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-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 21:41+0000\n" -"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -24,153 +24,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Basis-DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Benutzer-DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Passwort" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Benutzer-Login-Filter" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Benutzer-Filter-Liste" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiert den Filter für die Anfrage der Benutzer." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=person\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Gruppen-Filter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiert den Filter für die Anfrage der Gruppen." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Basis-Benutzerbaum" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Nutze TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Nicht empfohlen, nur zu Testzwecken." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Feld für den Anzeigenamen des Benutzers" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. " -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Feld für den Anzeigenamen der Gruppe" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. " -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "in Bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "in Sekunden. Eine Änderung leert den Cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Hilfe" diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 4712df12fdd..cea052cafa1 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-02 23:16+0200\n" -"PO-Revision-Date: 2012-10-02 06:46+0000\n" -"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -21,153 +21,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Base DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "User DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Συνθηματικό" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "User Login Filter" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "User List Filter" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Group Filter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Θύρα" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Base User Tree" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base Group Tree" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Group-Member association" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Χρήση TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Πεδίο Ονόματος Χρήστη" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Group Display Name Field" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "σε bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Βοήθεια" diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po index 0f048daf6be..419be520bc0 100644 --- a/l10n/eo/user_ldap.po +++ b/l10n/eo/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-10-14 02:05+0200\n" -"PO-Revision-Date: 2012-10-13 05:41+0000\n" -"Last-Translator: Mariano <mstreet@kde.org.ar>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Gastigo" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Baz-DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Uzanto-DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Pasvorto" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtrilo de uzantensaluto" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtrilo de uzantolisto" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtrilo de grupo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Pordo" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Baza uzantarbo" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Baza gruparbo" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asocio de grupo kaj membro" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Uzi TLS-on" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Malkapabligi validkontrolon de SSL-atestiloj." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Ne rekomendata, uzu ĝin nur por testoj." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Kampo de vidignomo de uzanto" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Kampo de vidignomo de grupo" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "duumoke" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Helpo" diff --git a/l10n/es/core.po b/l10n/es/core.po index c4ac4a05389..3aebf45effa 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -6,6 +6,7 @@ # <javierkaiser@gmail.com>, 2012. # Javier Llorente <javier@opensuse.org>, 2012. # <juanma@kde.org.ar>, 2011-2012. +# <malmirk@gmail.com>, 2012. # oSiNaReF <>, 2012. # Raul Fernandez Garcia <raulfg3@gmail.com>, 2012. # <rodrigo.calvo@gmail.com>, 2012. @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 11:51+0000\n" +"Last-Translator: malmirk <malmirk@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,26 +31,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "El usuario %s ha compartido un archivo contigo" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "El usuario %s ha compartido una carpeta contigo" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %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 "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -216,18 +217,18 @@ msgstr "Compartir con enlace" msgid "Password protect" msgstr "Protegido por contraseña" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Contraseña" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Enviar un enlace por correo electrónico a una persona" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Enviar" #: js/share.js:177 msgid "Set expiration date" @@ -295,11 +296,11 @@ msgstr "Error estableciendo fecha de caducidad" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "Enviando..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "Correo electrónico enviado" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -321,8 +322,8 @@ msgstr "Email de reconfiguración enviado." msgid "Request failed!" msgstr "Pedido fallado!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Nombre de usuario" @@ -411,44 +412,44 @@ msgstr "Su directorio de datos y sus archivos están probablemente accesibles de msgid "Create an <strong>admin account</strong>" msgstr "Crea una <strong>cuenta de administrador</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avanzado" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Directorio de almacenamiento" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Configurar la base de datos" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "se utilizarán" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Usuario de la base de datos" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Contraseña de la base de datos" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Nombre de la base de datos" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Espacio de tablas de la base de datos" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Host de la base de datos" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Completar la instalación" @@ -554,11 +555,11 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente." msgid "Lost your password?" msgstr "¿Has perdido tu contraseña?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "recuérdame" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Entrar" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index fdf3b2be402..32c72e60755 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -5,6 +5,7 @@ # Translators: # Javier Llorente <javier@opensuse.org>, 2012. # <juanma@kde.org.ar>, 2012. +# <manudeloz86@gmail.com>, 2012. # Raul Fernandez Garcia <raulfg3@gmail.com>, 2012. # Rubén Trujillo <rubentrf@gmail.com>, 2012. # <sergioballesterossolanas@gmail.com>, 2012. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-04 02:01+0200\n" -"PO-Revision-Date: 2012-09-03 14:15+0000\n" -"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\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" "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" @@ -23,153 +24,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Servidor" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN usuario" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Contraseña" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acceso anónimo, deje DN y contraseña vacíos." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtro de inicio de sesión de usuario" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Lista de filtros de usuario" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Define el filtro a aplicar, cuando se obtienen usuarios." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Sin placeholder, ej: \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtro de grupo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define el filtro a aplicar, cuando se obtienen grupos." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Puerto" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Árbol base de usuario" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Árbol base de grupo" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociación Grupo-Miembro" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "No usarlo para SSL, habrá error." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Apagar la validación por certificado SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "No recomendado, sólo para pruebas." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Campo de nombre de usuario a mostrar" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Campo de nombre de grupo a mostrar" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "en bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "en segundos. Un cambio vacía la cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ayuda" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 218284e3da9..80ab2e1f1f5 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/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-09-25 02:02+0200\n" -"PO-Revision-Date: 2012-09-24 22:51+0000\n" -"Last-Translator: cjtess <claudio.tessone@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Servidor" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:9 +#: 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\"" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN usuario" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Contraseña" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acceso anónimo, dejá DN y contraseña vacíos." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtro de inicio de sesión de usuario" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Lista de filtros de usuario" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Define el filtro a aplicar, cuando se obtienen usuarios." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Sin plantilla, p. ej.: \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtro de grupo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define el filtro a aplicar cuando se obtienen grupos." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Puerto" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Árbol base de usuario" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Árbol base de grupo" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociación Grupo-Miembro" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "No usarlo para SSL, dará error." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Desactivar la validación por certificado SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "No recomendado, sólo para pruebas." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Campo de nombre de usuario a mostrar" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Campo de nombre de grupo a mostrar" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "en bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "en segundos. Cambiarlo vacía la cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ayuda" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index ccccf7cb20a..c8207cb0467 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/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-10-30 00:01+0100\n" -"PO-Revision-Date: 2012-10-29 22:48+0000\n" -"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Baas DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Kasutaja DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Parool" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Kasutajanime filter" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Kasutajate nimekirja filter" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Grupi filter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Määrab gruppe hankides filtri, mida rakendatakse." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Baaskasutaja puu" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Baasgrupi puu" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Grupiliikme seotus" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Kasutaja TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Mittetõstutundlik LDAP server (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Lülita SSL sertifikaadi kontrollimine välja." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Pole soovitatav, kasuta ainult testimiseks." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Kasutaja näidatava nime väli" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Grupi näidatava nime väli" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "baitides" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "sekundites. Muudatus tühjendab vahemälu." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Abiinfo" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index a8b8ab93ae8..262c0ba4f38 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/user_ldap.po @@ -8,164 +8,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-31 02:02+0200\n" -"PO-Revision-Date: 2012-08-30 21:29+0000\n" -"Last-Translator: asieriko <asieriko@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Hostalaria" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Oinarrizko DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Erabiltzaile DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Pasahitza" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Erabiltzaileen saioa hasteko iragazkia" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Erabiltzaile zerrendaren Iragazkia" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "txantiloirik gabe, adb. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Taldeen iragazkia" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Portua" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Oinarrizko Erabiltzaile Zuhaitza" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Oinarrizko Talde Zuhaitza" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Talde-Kide elkarketak" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Erabili TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Ez erabili SSL konexioetan, huts egingo du." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Ezgaitu SSL ziurtagirien egiaztapena." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Erabiltzaileen bistaratzeko izena duen eremua" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Taldeen bistaratzeko izena duen eremua" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "bytetan" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "segundutan. Aldaketak katxea husten du." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Laguntza" diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po index 4a711bf2019..f7e8c607e27 100644 --- a/l10n/fa/user_ldap.po +++ b/l10n/fa/user_ldap.po @@ -8,164 +8,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fa\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "میزبانی" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "رمز عبور" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "راهنما" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index e57ca7e117c..c7c2c1c4a14 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: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 13:22+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -213,18 +213,18 @@ msgstr "Jaa linkillä" msgid "Password protect" msgstr "Suojaa salasanalla" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Salasana" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Lähetä linkki sähköpostitse" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Lähetä" #: js/share.js:177 msgid "Set expiration date" @@ -292,11 +292,11 @@ msgstr "Virhe päättymispäivää asettaessa" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "Lähetetään..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "Sähköposti lähetetty" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -318,8 +318,8 @@ msgstr "" msgid "Request failed!" msgstr "Pyyntö epäonnistui!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Käyttäjätunnus" @@ -408,44 +408,44 @@ msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htac msgid "Create an <strong>admin account</strong>" msgstr "Luo <strong>ylläpitäjän tunnus</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Lisäasetukset" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Datakansio" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Muokkaa tietokantaa" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "käytetään" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Tietokannan käyttäjä" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Tietokannan salasana" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Tietokannan nimi" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Tietokannan taulukkotila" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Tietokantapalvelin" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Viimeistele asennus" @@ -551,11 +551,11 @@ msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen." msgid "Lost your password?" msgstr "Unohditko salasanasi?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "muista" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Kirjaudu sisään" diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po index 085ca3dd65b..6f821f095c1 100644 --- a/l10n/fi_FI/user_ldap.po +++ b/l10n/fi_FI/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-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 10:56+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,153 +21,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Isäntä" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Oletus DN" -#: templates/settings.php:9 +#: 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ä " -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Käyttäjän DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Salasana" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi " -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Login suodatus" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Käyttäjien suodatus" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan. " -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Ryhmien suodatus" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. " -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Portti" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Oletuskäyttäjäpuu" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Ryhmien juuri" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Käytä TLS:ää" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. " -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Poista käytöstä SSL-varmenteen vahvistus" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Ei suositella, käytä vain testausta varten." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Käyttäjän näytettävän nimen kenttä" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä " -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Ryhmän \"näytettävä nimi\"-kenttä" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "tavuissa" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "sekunneissa. Muutos tyhjentää välimuistin." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ohje" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 7fca3da0d59..fee57ce5e39 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -12,164 +12,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-29 08:51+0000\n" -"Last-Translator: Windes <windes@tructor.net>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Hôte" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN Racine" -#: templates/settings.php:9 +#: 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é" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Mot de passe" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Modèle d'authentification utilisateurs" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtre d'utilisateurs" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sans élément de substitution, par exemple \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtre de groupes" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Définit le filtre à appliquer lors de la récupération des groupes." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "DN racine de l'arbre utilisateurs" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "DN racine de l'arbre groupes" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Association groupe-membre" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Utiliser TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Serveur LDAP insensible à la casse (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Désactiver la validation du certificat SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Non recommandé, utilisation pour tests uniquement." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Champ \"nom d'affichage\" de l'utilisateur" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Champ \"nom d'affichage\" du groupe" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "en octets" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "en secondes. Tout changement vide le cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Laisser vide " -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Aide" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index 8f640a984aa..e61cf22989a 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: 2012-12-08 00:09+0100\n" -"PO-Revision-Date: 2012-12-06 11:45+0000\n" -"Last-Translator: mbouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -20,153 +20,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Servidor" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:9 +#: 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»" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN do usuario" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso en anónimo de o DN e o contrasinal baleiros." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Contrasinal" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtro de acceso de usuarios" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtro da lista de usuarios" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Define o filtro a aplicar cando se recompilan os usuarios." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtro de grupo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define o filtro a aplicar cando se recompilan os grupos." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Porto" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Base da árbore de usuarios" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base da árbore de grupo" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociación de grupos e membros" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Non empregualo para conexións SSL: fallará." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Desactiva a validación do certificado SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Non se recomenda. Só para probas." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Campo de mostra do nome de usuario" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Campo de mostra do nome de grupo" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "en bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "en segundos. Calquera cambio baleira a caché." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Axuda" diff --git a/l10n/he/core.po b/l10n/he/core.po index 376b0ebf7f4..131ac2897e3 100644 --- a/l10n/he/core.po +++ b/l10n/he/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 07:42+0000\n" +"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,26 +24,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "המשתמש %s שיתף אתך קובץ" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "המשתמש %s שיתף אתך תיקייה" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %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 "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -210,18 +210,18 @@ msgstr "שיתוף עם קישור" msgid "Password protect" msgstr "הגנה בססמה" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "ססמה" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "שליחת קישור בדוא״ל למשתמש" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "שליחה" #: js/share.js:177 msgid "Set expiration date" @@ -289,11 +289,11 @@ msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "מתבצעת שליחה ..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "הודעת הדוא״ל נשלחה" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -315,8 +315,8 @@ msgstr "איפוס שליחת דוא״ל." msgid "Request failed!" msgstr "הבקשה נכשלה!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "שם משתמש" @@ -405,44 +405,44 @@ msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישי msgid "Create an <strong>admin account</strong>" msgstr "יצירת <strong>חשבון מנהל</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "מתקדם" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "תיקיית נתונים" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "הגדרת מסד הנתונים" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "ינוצלו" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "שם משתמש במסד הנתונים" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "ססמת מסד הנתונים" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "שם מסד הנתונים" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "מרחב הכתובות של מסד הנתונים" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "שרת בסיס נתונים" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "סיום התקנה" @@ -548,11 +548,11 @@ msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונ msgid "Lost your password?" msgstr "שכחת את ססמתך?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "שמירת הססמה" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "כניסה" diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po index 88370513135..fb4f06d8441 100644 --- a/l10n/he/user_ldap.po +++ b/l10n/he/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po index 1ca5b6139b6..ae9f03b0212 100644 --- a/l10n/hi/user_ldap.po +++ b/l10n/hi/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hi\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po index a7e026ac791..5861922d336 100644 --- a/l10n/hr/user_ldap.po +++ b/l10n/hr/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index cacb371b1b5..330b4cd1465 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: hu_HU\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po index 73b531764ae..cae53dce374 100644 --- a/l10n/ia/user_ldap.po +++ b/l10n/ia/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ia\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index 8069104219e..193df390395 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/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-10-22 02:02+0200\n" -"PO-Revision-Date: 2012-10-21 05:36+0000\n" -"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "kata kunci" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "gunakan saringan login" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "saringan grup" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "gunakan TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "matikan validasi sertivikat SSL" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "tidak disarankan, gunakan hanya untuk pengujian." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "dalam bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "dalam detik. perubahan mengosongkan cache" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "bantuan" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index 469ae8a332d..06ab3b51ea6 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/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: 2012-12-06 00:11+0100\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/it/core.po b/l10n/it/core.po index 7dedc7efb1e..d1d6f74af3f 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-14 00:16+0100\n" -"PO-Revision-Date: 2012-12-13 09:09+0000\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 08:54+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" @@ -211,14 +211,14 @@ msgstr "Condividi con collegamento" msgid "Password protect" msgstr "Proteggi con password" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Password" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Invia collegamento via email" #: js/share.js:173 msgid "Send" @@ -316,8 +316,8 @@ msgstr "Email di ripristino inviata." msgid "Request failed!" msgstr "Richiesta non riuscita!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Nome utente" @@ -406,44 +406,44 @@ msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Int msgid "Create an <strong>admin account</strong>" msgstr "Crea un <strong>account amministratore</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avanzate" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Cartella dati" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Configura il database" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "sarà utilizzato" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Utente del database" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Password del database" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Nome del database" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Spazio delle tabelle del database" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Host del database" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Termina la configurazione" @@ -549,11 +549,11 @@ msgstr "Cambia la password per rendere nuovamente sicuro il tuo account." msgid "Lost your password?" msgstr "Hai perso la password?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "ricorda" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Accedi" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index 9c8655920c6..9dc0007050a 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -9,164 +9,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-29 05:37+0000\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" "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" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN utente" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Password" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtro per l'accesso utente" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtro per l'elenco utenti" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtro per il gruppo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Porta" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Struttura base dell'utente" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Struttura base del gruppo" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Associazione gruppo-utente " -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usa TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Non utilizzare per le connessioni SSL, fallirà." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Case insensitve LDAP server (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Disattiva il controllo del certificato SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Non consigliato, utilizzare solo per test." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Campo per la visualizzazione del nome utente" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Campo per la visualizzazione del nome del gruppo" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "in byte" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "in secondi. Il cambio svuota la cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Aiuto" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index a60188539af..ae1bd30ee44 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -4,14 +4,15 @@ # # Translators: # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012. +# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012. # <tetuyano+transi@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 11:56+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,26 +23,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "ユーザ %s はあなたとファイルを共有しています" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "ユーザ %s はあなたとフォルダを共有しています" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %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 "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -208,18 +209,18 @@ msgstr "URLリンクで共有" msgid "Password protect" msgstr "パスワード保護" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "パスワード" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "メールリンク" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "送信" #: js/share.js:177 msgid "Set expiration date" @@ -287,11 +288,11 @@ msgstr "有効期限の設定でエラー発生" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "送信中..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "メールを送信しました" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -313,8 +314,8 @@ msgstr "リセットメールを送信します。" msgid "Request failed!" msgstr "リクエスト失敗！" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "ユーザ名" @@ -403,44 +404,44 @@ msgstr "データディレクトリとファイルが恐らくインターネッ msgid "Create an <strong>admin account</strong>" msgstr "<strong>管理者アカウント</strong>を作成してください" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "詳細設定" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "データフォルダ" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "データベースを設定してください" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "が使用されます" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "データベースのユーザ名" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "データベースのパスワード" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "データベース名" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "データベースの表領域" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "データベースのホスト名" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "セットアップを完了します" @@ -546,11 +547,11 @@ msgstr "アカウント保護の為、パスワードを再度の変更をお願 msgid "Lost your password?" msgstr "パスワードを忘れましたか？" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "パスワードを記憶する" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "ログイン" diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po index bd04cb5c537..39aa1002f7e 100644 --- a/l10n/ja_JP/user_ldap.po +++ b/l10n/ja_JP/user_ldap.po @@ -4,14 +4,15 @@ # # Translators: # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012. +# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012. # <tetuyano+transi@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-02 02:03+0200\n" -"PO-Revision-Date: 2012-10-01 08:48+0000\n" -"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\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" "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" @@ -20,153 +21,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。" + +#: templates/settings.php:11 +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 モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。" + +#: templates/settings.php:15 msgid "Host" msgstr "ホスト" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "ベースDN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "拡張タブでユーザとグループのベースDNを指定することができます。" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "ユーザDN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "パスワード" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "ユーザログインフィルタ" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "ユーザリストフィルタ" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "ユーザーを取得するときに適用するフィルターを定義する。" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "グループフィルタ" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "グループを取得するときに適用するフィルターを定義する。" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "ポート" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "ベースユーザツリー" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "ベースグループツリー" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "グループとメンバーの関連付け" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "TLSを利用" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "SSL接続に利用しないでください、失敗します。" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "SSL証明書の確認を無効にする。" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "推奨しません、テスト目的でのみ利用してください。" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "ユーザ表示名のフィールド" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "ユーザのownCloud名の生成に利用するLDAP属性。" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "グループ表示名のフィールド" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "グループのownCloud名の生成に利用するLDAP属性。" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "バイト" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "秒。変更後にキャッシュがクリアされます。" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "ヘルプ" diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po index bdf29a00b31..0df8aa5b1a4 100644 --- a/l10n/ka_GE/user_ldap.po +++ b/l10n/ka_GE/user_ldap.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-22 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po index f9102c199e2..b10823d7147 100644 --- a/l10n/ko/user_ldap.po +++ b/l10n/ko/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-10 00:11+0100\n" -"PO-Revision-Date: 2012-12-09 06:10+0000\n" -"Last-Translator: Shinjo Park <kde@peremen.name>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -20,153 +20,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "호스트" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오." -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "기본 DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다." -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "사용자 DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "암호" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "사용자 로그인 필터" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "사용자 목록 필터" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "사용자를 검색할 때 적용할 필터를 정의합니다." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "그룹 필터" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "그룹을 검색할 때 적용할 필터를 정의합니다." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "포트" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "기본 사용자 트리" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "기본 그룹 트리" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "그룹-회원 연결" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "TLS 사용" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "SSL 연결 시 사용하는 경우 연결되지 않습니다." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "서버에서 대소문자를 구분하지 않음 (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "SSL 인증서 유효성 검사를 해제합니다." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "추천하지 않음, 테스트로만 사용하십시오." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "사용자의 표시 이름 필드" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "그룹의 표시 이름 필드" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "바이트" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "초. 항목 변경 시 캐시가 갱신됩니다." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "도움말" diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po index bfa7aee57b7..f4e484f84f7 100644 --- a/l10n/ku_IQ/user_ldap.po +++ b/l10n/ku_IQ/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: 2012-10-07 02:03+0200\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po index ea1a1452c6f..be1657cb3d3 100644 --- a/l10n/lb/user_ldap.po +++ b/l10n/lb/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lb\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index 7e15e309ec7..9891d24f372 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -8,164 +8,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lt_LT\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Slaptažodis" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Grupės filtras" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Prievadas" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Naudoti TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Išjungti SSL sertifikato tikrinimą." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Nerekomenduojama, naudokite tik testavimui." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Pagalba" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index 2ec176f9288..b0d8f36bed3 100644 --- a/l10n/lv/user_ldap.po +++ b/l10n/lv/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index e7581975904..6fd1d14dd61 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.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-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 12:49+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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" @@ -23,30 +23,30 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Корисникот %s сподели датотека со Вас" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Корисникот %s сподели папка со Вас" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %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 "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Не беше доставен тип на категорија." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -60,18 +60,18 @@ msgstr "Оваа категорија веќе постои:" #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Не беше доставен тип на објект." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID не беше доставено." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Грешка при додавање %s во омилени." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -80,7 +80,7 @@ msgstr "Не е одбрана категорија за бришење." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Грешка при бришење на %s од омилени." #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" @@ -88,59 +88,59 @@ msgstr "Поставки" #: js/js.js:704 msgid "seconds ago" -msgstr "" +msgstr "пред секунди" #: js/js.js:705 msgid "1 minute ago" -msgstr "" +msgstr "пред 1 минута" #: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "пред {minutes} минути" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "пред 1 час" #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "пред {hours} часови" #: js/js.js:709 msgid "today" -msgstr "" +msgstr "денеска" #: js/js.js:710 msgid "yesterday" -msgstr "" +msgstr "вчера" #: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "пред {days} денови" #: js/js.js:712 msgid "last month" -msgstr "" +msgstr "минатиот месец" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "пред {months} месеци" #: js/js.js:714 msgid "months ago" -msgstr "" +msgstr "пред месеци" #: js/js.js:715 msgid "last year" -msgstr "" +msgstr "минатата година" #: js/js.js:716 msgid "years ago" -msgstr "" +msgstr "пред години" #: js/oc-dialogs.js:126 msgid "Choose" -msgstr "" +msgstr "Избери" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" @@ -161,7 +161,7 @@ msgstr "Во ред" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." -msgstr "" +msgstr "Не е специфициран типот на објект." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 @@ -171,92 +171,92 @@ msgstr "Грешка" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Името на апликацијата не е специфицирано." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Задолжителната датотека {file} не е инсталирана!" #: js/share.js:124 js/share.js:581 msgid "Error while sharing" -msgstr "" +msgstr "Грешка при споделување" #: js/share.js:135 msgid "Error while unsharing" -msgstr "" +msgstr "Грешка при прекин на споделување" #: js/share.js:142 msgid "Error while changing permissions" -msgstr "" +msgstr "Грешка при промена на привилегии" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Споделено со Вас и групата {group} од {owner}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Споделено со Вас од {owner}" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "Сподели со" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "Сподели со врска" #: js/share.js:164 msgid "Password protect" -msgstr "" +msgstr "Заштити со лозинка" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Лозинка" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Прати врска по е-пошта на личност" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Прати" #: js/share.js:177 msgid "Set expiration date" -msgstr "" +msgstr "Постави рок на траење" #: js/share.js:178 msgid "Expiration date" -msgstr "" +msgstr "Рок на траење" #: js/share.js:210 msgid "Share via email:" -msgstr "" +msgstr "Сподели по е-пошта:" #: js/share.js:212 msgid "No people found" -msgstr "" +msgstr "Не се најдени луѓе" #: js/share.js:239 msgid "Resharing is not allowed" -msgstr "" +msgstr "Повторно споделување не е дозволено" #: js/share.js:275 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Споделено во {item} со {user}" #: js/share.js:296 msgid "Unshare" -msgstr "" +msgstr "Не споделувај" #: js/share.js:308 msgid "can edit" -msgstr "" +msgstr "може да се измени" #: js/share.js:310 msgid "access control" -msgstr "" +msgstr "контрола на пристап" #: js/share.js:313 msgid "create" @@ -264,35 +264,35 @@ msgstr "креирај" #: js/share.js:316 msgid "update" -msgstr "" +msgstr "ажурирај" #: js/share.js:319 msgid "delete" -msgstr "" +msgstr "избриши" #: js/share.js:322 msgid "share" -msgstr "" +msgstr "сподели" #: js/share.js:353 js/share.js:528 js/share.js:530 msgid "Password protected" -msgstr "" +msgstr "Заштитено со лозинка" #: js/share.js:541 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Грешка при тргање на рокот на траење" #: js/share.js:553 msgid "Error setting expiration date" -msgstr "" +msgstr "Грешка при поставување на рок на траење" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "Праќање..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "Е-порака пратена" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -308,14 +308,14 @@ msgstr "Ќе добиете врска по е-пошта за да може д #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Порката за ресетирање на лозинка пратена." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Барањето не успеа!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Корисничко име" @@ -377,19 +377,19 @@ msgstr "Додади" #: templates/installation.php:23 templates/installation.php:31 msgid "Security Warning" -msgstr "" +msgstr "Безбедносно предупредување" #: templates/installation.php:24 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот." #: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. " #: templates/installation.php:32 msgid "" @@ -398,50 +398,50 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "" +msgstr "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот." #: templates/installation.php:36 msgid "Create an <strong>admin account</strong>" msgstr "Направете <strong>администраторска сметка</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Напредно" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Фолдер со податоци" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Конфигурирај ја базата" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "ќе биде користено" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Корисник на база" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Лозинка на база" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Име на база" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" -msgstr "" +msgstr "Табела во базата на податоци" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Сервер со база" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Заврши го подесувањето" @@ -531,27 +531,27 @@ msgstr "Одјава" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Одбиена автоматска најава!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана" #: templates/login.php:10 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно." #: templates/login.php:15 msgid "Lost your password?" msgstr "Ја заборавивте лозинката?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "запамти" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Најава" @@ -569,14 +569,14 @@ msgstr "следно" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Безбедносно предупредување." #: templates/verify.php:6 msgid "" "Please verify your password. <br/>For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно." #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Потврди" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 6ff02992220..778f65fd741 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.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-01 00:01+0100\n" -"PO-Revision-Date: 2012-11-30 23:02+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 12:18+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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,7 +27,7 @@ msgstr "Нема грешка, датотеката беше подигната #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:" #: ajax/upload.php:23 msgid "" @@ -55,136 +55,136 @@ msgstr "Неуспеав да запишам на диск" msgid "Files" msgstr "Датотеки" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" -msgstr "" +msgstr "Не споделувај" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Избриши" #: js/fileactions.js:181 msgid "Rename" -msgstr "" +msgstr "Преименувај" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} веќе постои" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" -msgstr "" +msgstr "замени" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" -msgstr "" +msgstr "предложи име" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" -msgstr "" +msgstr "откажи" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" -msgstr "" +msgstr "земенета {new_name}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" -msgstr "" +msgstr "врати" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "заменета {new_name} со {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" -msgstr "" +msgstr "без споделување {files}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" -msgstr "" +msgstr "избришани {files}" #: js/files.js:33 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "Се генерира ZIP фајлот, ќе треба извесно време." -#: js/files.js:218 +#: js/files.js:209 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти" -#: js/files.js:218 +#: js/files.js:209 msgid "Upload Error" msgstr "Грешка при преземање" -#: js/files.js:235 +#: js/files.js:226 msgid "Close" msgstr "Затвои" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:245 js/files.js:359 js/files.js:389 msgid "Pending" msgstr "Чека" -#: js/files.js:274 +#: js/files.js:265 msgid "1 file uploading" -msgstr "" +msgstr "1 датотека се подига" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:268 js/files.js:322 js/files.js:337 msgid "{count} files uploading" -msgstr "" +msgstr "{count} датотеки се подигаат" -#: js/files.js:349 js/files.js:382 +#: js/files.js:340 js/files.js:373 msgid "Upload cancelled." msgstr "Преземањето е прекинато." -#: js/files.js:451 +#: js/files.js:442 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине." -#: js/files.js:523 +#: js/files.js:512 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud" -#: js/files.js:704 +#: js/files.js:693 msgid "{count} files scanned" -msgstr "" +msgstr "{count} датотеки скенирани" -#: js/files.js:712 +#: js/files.js:701 msgid "error while scanning" -msgstr "" +msgstr "грешка при скенирање" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:774 templates/index.php:66 msgid "Name" msgstr "Име" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:775 templates/index.php:77 msgid "Size" msgstr "Големина" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:776 templates/index.php:79 msgid "Modified" msgstr "Променето" -#: js/files.js:814 +#: js/files.js:803 msgid "1 folder" -msgstr "" +msgstr "1 папка" -#: js/files.js:816 +#: js/files.js:805 msgid "{count} folders" -msgstr "" +msgstr "{count} папки" -#: js/files.js:824 +#: js/files.js:813 msgid "1 file" -msgstr "" +msgstr "1 датотека" -#: js/files.js:826 +#: js/files.js:815 msgid "{count} files" -msgstr "" +msgstr "{count} датотеки" #: templates/admin.php:5 msgid "File handling" @@ -232,7 +232,7 @@ msgstr "Папка" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "Од врска" #: templates/index.php:35 msgid "Upload" @@ -242,28 +242,28 @@ msgstr "Подигни" msgid "Cancel upload" msgstr "Откажи прикачување" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Тука нема ништо. Снимете нешто!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Преземи" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Датотеката е премногу голема" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Се скенираат датотеки, ве молам почекајте." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "Моментално скенирам" diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po index 7a40ba3a3b1..2b4f5dfb57a 100644 --- a/l10n/mk/files_encryption.po +++ b/l10n/mk/files_encryption.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Georgi Stanojevski <glisha@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 13:14+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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" "Content-Transfer-Encoding: 8bit\n" "Language: mk\n" -"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n" +"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "Енкрипција" #: templates/settings.php:4 msgid "Exclude the following file types from encryption" -msgstr "" +msgstr "Исклучи ги следните типови на датотеки од енкрипција" #: templates/settings.php:5 msgid "None" -msgstr "" +msgstr "Ништо" -#: templates/settings.php:10 +#: templates/settings.php:12 msgid "Enable Encryption" -msgstr "" +msgstr "Овозможи енкрипција" diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po index 0505c9e2d88..6fcaf65d89d 100644 --- a/l10n/mk/files_external.po +++ b/l10n/mk/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 13:00+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" @@ -64,7 +64,7 @@ msgstr "" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "Админ" #: templates/settings.php:10 msgid "Configuration" diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po index 99f5454f5a5..51205c77b2c 100644 --- a/l10n/mk/files_sharing.po +++ b/l10n/mk/files_sharing.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Georgi Stanojevski <glisha@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 13:31+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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" @@ -19,30 +20,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Лозинка" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Прати" -#: templates/public.php:9 +#: templates/public.php:17 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s ја сподели папката %s со Вас" -#: templates/public.php:11 +#: templates/public.php:19 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s ја сподели датотеката %s со Вас" -#: templates/public.php:14 templates/public.php:30 +#: templates/public.php:22 templates/public.php:38 msgid "Download" -msgstr "" +msgstr "Преземи" -#: templates/public.php:29 +#: templates/public.php:37 msgid "No preview available for" -msgstr "" +msgstr "Нема достапно преглед за" -#: templates/public.php:37 +#: templates/public.php:43 msgid "web services under your control" -msgstr "" +msgstr "веб сервиси под Ваша контрола" diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po index c611ab40b13..bbe751713aa 100644 --- a/l10n/mk/files_versions.po +++ b/l10n/mk/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Georgi Stanojevski <glisha@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 13:19+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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" @@ -19,24 +20,24 @@ msgstr "" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" -msgstr "" +msgstr "Истечи ги сите верзии" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Историја" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Версии" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Верзии на датотеки" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Овозможи" diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po index 4be426c9be1..a315a725a96 100644 --- a/l10n/mk/lib.po +++ b/l10n/mk/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Georgi Stanojevski <glisha@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 13:04+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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" @@ -17,57 +18,57 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "Помош" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "Лично" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "Параметри" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "Корисници" -#: app.php:309 +#: app.php:311 msgid "Apps" -msgstr "" +msgstr "Аппликации" -#: app.php:311 +#: app.php:313 msgid "Admin" -msgstr "" +msgstr "Админ" -#: files.php:332 +#: files.php:366 msgid "ZIP download is turned off." -msgstr "" +msgstr "Преземање во ZIP е исклучено" -#: files.php:333 +#: files.php:367 msgid "Files need to be downloaded one by one." -msgstr "" +msgstr "Датотеките треба да се симнат една по една." -#: files.php:333 files.php:358 +#: files.php:367 files.php:392 msgid "Back to Files" -msgstr "" +msgstr "Назад кон датотеки" -#: files.php:357 +#: files.php:391 msgid "Selected files too large to generate zip file." -msgstr "" +msgstr "Избраните датотеки се преголеми за да се генерира zip." #: json.php:28 msgid "Application is not enabled" -msgstr "" +msgstr "Апликацијата не е овозможена" #: json.php:39 json.php:64 json.php:77 json.php:89 msgid "Authentication error" -msgstr "" +msgstr "Грешка во автентикација" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "" +msgstr "Жетонот е истечен. Ве молам превчитајте ја страницата." #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" @@ -79,74 +80,74 @@ msgstr "Текст" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Слики" #: template.php:103 msgid "seconds ago" -msgstr "" +msgstr "пред секунди" #: template.php:104 msgid "1 minute ago" -msgstr "" +msgstr "пред 1 минута" #: template.php:105 #, php-format msgid "%d minutes ago" -msgstr "" +msgstr "пред %d минути" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "пред 1 час" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "пред %d часови" #: template.php:108 msgid "today" -msgstr "" +msgstr "денеска" #: template.php:109 msgid "yesterday" -msgstr "" +msgstr "вчера" #: template.php:110 #, php-format msgid "%d days ago" -msgstr "" +msgstr "пред %d денови" #: template.php:111 msgid "last month" -msgstr "" +msgstr "минатиот месец" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "пред %d месеци" #: template.php:113 msgid "last year" -msgstr "" +msgstr "минатата година" #: template.php:114 msgid "years ago" -msgstr "" +msgstr "пред години" #: updater.php:75 #, php-format msgid "%s is available. Get <a href=\"%s\">more information</a>" -msgstr "" +msgstr "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>" #: updater.php:77 msgid "up to date" -msgstr "" +msgstr "ажурно" #: updater.php:80 msgid "updates check is disabled" -msgstr "" +msgstr "проверката за ажурирања е оневозможена" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Не можам да најдам категорија „%s“" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index b295cb7b667..996f3f83928 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Georgi Stanojevski <glisha@gmail.com>, 2012. # Miroslav Jovanovic <j.miroslav@gmail.com>, 2012. # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-03 00:04+0100\n" -"PO-Revision-Date: 2012-12-02 03:18+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:14+0100\n" +"PO-Revision-Date: 2012-12-17 12:13+0000\n" +"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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" @@ -21,19 +22,19 @@ msgstr "" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" -msgstr "" +msgstr "Неможам да вчитам листа од App Store" #: ajax/creategroup.php:10 msgid "Group already exists" -msgstr "" +msgstr "Групата веќе постои" #: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "" +msgstr "Неможе да додадам група" #: ajax/enableapp.php:12 msgid "Could not enable app. " -msgstr "" +msgstr "Неможе да овозможам апликација." #: ajax/lostpassword.php:12 msgid "Email saved" @@ -53,15 +54,15 @@ msgstr "неправилно барање" #: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "" +msgstr "Неможе да избришам група" #: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18 msgid "Authentication error" -msgstr "" +msgstr "Грешка во автентикација" #: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "" +msgstr "Неможам да избришам корисник" #: ajax/setlanguage.php:15 msgid "Language changed" @@ -69,17 +70,17 @@ msgstr "Јазикот е сменет" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "Администраторите неможе да се избришат себеси од админ групата" #: ajax/togglegroups.php:28 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Неможе да додадам корисник во група %s" #: ajax/togglegroups.php:34 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Неможе да избришам корисник од група %s" #: js/apps.js:28 js/apps.js:67 msgid "Disable" @@ -103,7 +104,7 @@ msgstr "Додадете ја Вашата апликација" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "Повеќе аппликации" #: templates/apps.php:27 msgid "Select an App" @@ -115,7 +116,7 @@ msgstr "Види ја страницата со апликации на apps.own #: templates/apps.php:32 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" -msgstr "" +msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>" #: templates/help.php:9 msgid "Documentation" @@ -144,7 +145,7 @@ msgstr "Одговор" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" -msgstr "" +msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -156,7 +157,7 @@ msgstr "Преземање" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Вашата лозинка беше променета." #: templates/personal.php:20 msgid "Unable to change your password" @@ -210,7 +211,7 @@ msgid "" "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " "target=\"_blank\"><abbr title=\"Affero General Public " "License\">AGPL</abbr></a>." -msgstr "" +msgstr "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." #: templates/users.php:21 templates/users.php:76 msgid "Name" @@ -238,7 +239,7 @@ msgstr "Останато" #: templates/users.php:80 templates/users.php:112 msgid "Group Admin" -msgstr "" +msgstr "Администратор на група" #: templates/users.php:82 msgid "Quota" diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po index 126d33adf67..206aa2878d7 100644 --- a/l10n/mk/user_ldap.po +++ b/l10n/mk/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 13:32+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" "Content-Transfer-Encoding: 8bit\n" "Language: mk\n" -"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n" +"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" -msgstr "" +msgstr "Лозинка" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po index e0ec2850865..4509f10da64 100644 --- a/l10n/ms_MY/user_ldap.po +++ b/l10n/ms_MY/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ms_MY\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index 1ebfbe8b544..b415afa31aa 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/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-10-31 00:01+0100\n" -"PO-Revision-Date: 2012-10-30 13:08+0000\n" -"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Passord" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Gruppefilter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Bruk TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Ikke anbefalt, bruk kun for testing" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "i bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "i sekunder. En endring tømmer bufferen." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Hjelp" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index e6819a76937..a608c7eddea 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/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-11-13 00:05+0100\n" -"PO-Revision-Date: 2012-11-12 09:35+0000\n" -"Last-Translator: Len <lenny@weijl.org>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Basis DN" -#: templates/settings.php:9 +#: 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." -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Gebruikers DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Wachtwoord" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Gebruikers Login Filter" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Gebruikers Lijst Filter" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "zonder een placeholder, bijv. \"objectClass=person\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Groep Filter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Poort" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Basis Gebruikers Structuur" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Basis Groupen Structuur" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Groepslid associatie" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Gebruik TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Gebruik niet voor SSL connecties, deze mislukken." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Schakel SSL certificaat validatie uit." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Niet aangeraden, gebruik alleen voor test doeleinden." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Gebruikers Schermnaam Veld" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Groep Schermnaam Veld" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "in bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "in seconden. Een verandering maakt de cache leeg." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Help" diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index 2d5b008d920..7f064cb1e25 100644 --- a/l10n/nn_NO/user_ldap.po +++ b/l10n/nn_NO/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nn_NO\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po index e4321202c2f..29bd7864d7e 100644 --- a/l10n/oc/user_ldap.po +++ b/l10n/oc/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: 2012-09-08 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index bfca95f3979..494afd04759 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-14 00:16+0100\n" -"PO-Revision-Date: 2012-12-13 07:16+0000\n" -"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 09:39+0000\n" +"Last-Translator: emc <mplichta@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" @@ -30,26 +30,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Użytkownik %s współdzieli plik z tobą" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Uzytkownik %s wspóldzieli folder z toba" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %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 "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -216,7 +216,7 @@ msgstr "Współdziel z link" msgid "Password protect" msgstr "Zabezpieczone hasłem" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Hasło" @@ -321,8 +321,8 @@ msgstr "Wyślij zresetowany email." msgid "Request failed!" msgstr "Próba nieudana!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Nazwa użytkownika" @@ -411,44 +411,44 @@ msgstr "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu msgid "Create an <strong>admin account</strong>" msgstr "Tworzenie <strong>konta administratora</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Zaawansowane" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Katalog danych" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Konfiguracja bazy danych" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "zostanie użyte" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Użytkownik bazy danych" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Hasło do bazy danych" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Nazwa bazy danych" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Obszar tabel bazy danych" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Komputer bazy danych" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Zakończ konfigurowanie" @@ -554,11 +554,11 @@ msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie." msgid "Lost your password?" msgstr "Nie pamiętasz hasła?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "Zapamiętanie" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Zaloguj" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index d351bc786e2..25b35d770df 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -4,169 +4,183 @@ # # Translators: # Cyryl Sochacki <>, 2012. +# Marcin Małecki <gerber@tkdami.net>, 2012. # Paweł Ciecierski <pciecierski@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-31 02:02+0200\n" -"PO-Revision-Date: 2012-08-30 15:50+0000\n" -"Last-Translator: Paweł Ciecierski <pciecierski@gmail.com>\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" "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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Baza DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Użytkownik DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Hasło" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtr logowania użytkownika" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Lista filtrów użytkownika" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Grupa filtrów" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiuje filtry do zastosowania, podczas pobierania grup." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Drzewo bazy użytkowników" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Drzewo bazy grup" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Członek grupy stowarzyszenia" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Użyj TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Nie używaj SSL dla połączeń, jeśli się nie powiedzie." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Wielkość liter serwera LDAP (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Niezalecane, użyj tylko testowo." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Pole wyświetlanej nazwy użytkownika" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Pole wyświetlanej nazwy grupy" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "w bajtach" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "w sekundach. Zmiana opróżnia pamięć podręczną." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Pomoc" diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po index 554396a6fe0..de4bd2f3523 100644 --- a/l10n/pl_PL/user_ldap.po +++ b/l10n/pl_PL/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-31 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pl_PL\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index ddfc711b8ea..fdd9c02d90a 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/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-09-24 02:01+0200\n" -"PO-Revision-Date: 2012-09-23 17:35+0000\n" -"Last-Translator: sedir <philippi.sedir@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Host" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN Base" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN Usuário" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Senha" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acesso anônimo, deixe DN e Senha vazios." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtro de Login de Usuário" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "use %%uid placeholder, ex. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtro de Lista de Usuário" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Define filtro a aplicar ao obter usuários." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtro de Grupo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define o filtro a aplicar ao obter grupos." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Porta" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Árvore de Usuário Base" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Árvore de Grupo Base" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Associação Grupo-Membro" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Não use-o para conexões SSL, pois falhará." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor LDAP sensível à caixa alta (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Desligar validação de certificado SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Não recomendado, use somente para testes." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Campo Nome de Exibição de Usuário" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Campo Nome de Exibição de Grupo" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "em bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "em segundos. Uma mudança esvaziará o cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ajuda" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 2a05167e0de..92daefee097 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.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-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 01:27+0000\n" +"Last-Translator: Mouxy <daniel@mouxy.net>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,26 +26,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "O utilizador %s partilhou um ficheiro consigo." #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "O utilizador %s partilhou uma pasta consigo." #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %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 "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -212,18 +212,18 @@ msgstr "Partilhar com link" msgid "Password protect" msgstr "Proteger com palavra-passe" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Palavra chave" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Enviar o link por e-mail" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Enviar" #: js/share.js:177 msgid "Set expiration date" @@ -291,11 +291,11 @@ msgstr "Erro ao aplicar a data de expiração" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "A Enviar..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "E-mail enviado com sucesso!" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -317,8 +317,8 @@ msgstr "E-mail de reinicialização enviado." msgid "Request failed!" msgstr "O pedido falhou!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Utilizador" @@ -407,44 +407,44 @@ msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acess msgid "Create an <strong>admin account</strong>" msgstr "Criar uma <strong>conta administrativa</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avançado" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Pasta de dados" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Configure a base de dados" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "vai ser usada" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Utilizador da base de dados" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Password da base de dados" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Nome da base de dados" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Tablespace da base de dados" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Host da base de dados" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Acabar instalação" @@ -550,11 +550,11 @@ msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo." msgid "Lost your password?" msgstr "Esqueceu a sua password?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "lembrar" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Entrar" diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po index 1f14f0cbdf5..6319794b213 100644 --- a/l10n/pt_PT/files_external.po +++ b/l10n/pt_PT/files_external.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <daniel@mouxy.net>, 2012. # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 01:29+0000\n" +"Last-Translator: Mouxy <daniel@mouxy.net>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,14 +47,14 @@ msgstr "Erro ao configurar o armazenamento do Google Drive" msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar." #: lib/config.php:435 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "" +msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 07c6f1ca249..2ecb6bd3751 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-08 00:01+0100\n" -"PO-Revision-Date: 2012-11-07 15:39+0000\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" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -22,153 +22,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Anfitrião" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN do utilizador" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "O DN to cliente " -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Palavra-passe" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtro de login de utilizador" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Utilizar filtro" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Defina o filtro a aplicar, ao recuperar utilizadores." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filtrar por grupo" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Defina o filtro a aplicar, ao recuperar grupos." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Porto" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Base da árvore de utilizadores." -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Base da árvore de grupos." -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Associar utilizador ao grupo." -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Não use para ligações SSL, irá falhar." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor LDAP (Windows) não sensível a maiúsculas." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Desligar a validação de certificado SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Não recomendado, utilizado apenas para testes!" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Mostrador do nome de utilizador." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Mostrador do nome do grupo." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "em bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "em segundos. Uma alteração esvazia a cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ajuda" diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index 8b79d7561fa..a7e5abcc360 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -9,164 +9,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-31 02:02+0200\n" -"PO-Revision-Date: 2012-08-30 17:51+0000\n" -"Last-Translator: iuranemo <iuranemo@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Gazdă" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN de bază" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN al utilizatorului" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Parolă" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Pentru acces anonim, lăsați DN și Parolă libere." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filtrare după Nume Utilizator" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filtrarea după lista utilizatorilor" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "fără substituenți, d.e. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Fitrare Grup" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definește filtrele care se aplică, când se preiau grupurile." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "fără substituenți, d.e. \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Portul" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Arborele de bază al Utilizatorilor" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Arborele de bază al Grupurilor" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asocierea Grup-Membru" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Utilizează TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "A nu se utiliza pentru conexiuni SSL, va eșua." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Server LDAP insensibil la majuscule (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Oprește validarea certificatelor SSL " -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Nu este recomandat, a se utiliza doar pentru testare." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Câmpul cu numele vizibil al utilizatorului" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Câmpul cu numele grupului" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "în octeți" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "în secunde. O schimbare curăță memoria tampon." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Ajutor" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index b3dbb4c446e..5ab21a67d52 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -5,168 +5,182 @@ # Translators: # <4671992@gmail.com>, 2012. # Denis <reg.transifex.net@demitel.ru>, 2012. +# <semen@sam002.net>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-29 05:08+0000\n" -"Last-Translator: Denis <reg.transifex.net@demitel.ru>\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" "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" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них." + +#: templates/settings.php:11 +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 модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его." + +#: templates/settings.php:15 msgid "Host" msgstr "Сервер" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Базовый DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN пользователя" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Пароль" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Для анонимного доступа оставьте DN и пароль пустыми." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Фильтр входа пользователей" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Фильтр списка пользователей" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Определяет фильтр для применения при получении пользователей." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "без заполнителя, например: \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Фильтр группы" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Определяет фильтр для применения при получении группы." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "без заполнения, например \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Порт" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "База пользовательского дерева" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "База группового дерева" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Ассоциация Группа-Участник" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Использовать TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Не используйте для соединений SSL" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Нечувствительный к регистру сервер LDAP (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Отключить проверку сертификата SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Не рекомендуется, используйте только для тестирования." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Поле отображаемого имени пользователя" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Атрибут LDAP для генерации имени пользователя ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Поле отображаемого имени группы" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Атрибут LDAP для генерации имени группы ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "в байтах" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "в секундах. Изменение очистит кэш." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Помощь" diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po index ede57ac4db4..007386b6eb0 100644 --- a/l10n/ru_RU/core.po +++ b/l10n/ru_RU/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 10:54+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,26 +21,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Пользователь %s открыл Вам доступ к файлу" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Пользователь %s открыл Вам доступ к папке" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %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 "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -162,8 +162,8 @@ msgid "The object type is not specified." msgstr "Тип объекта не указан." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Ошибка" @@ -175,7 +175,7 @@ msgstr "Имя приложения не указано." msgid "The required file {file} is not installed!" msgstr "Требуемый файл {файл} не установлен!" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Ошибка создания общего доступа" @@ -203,11 +203,11 @@ msgstr "Сделать общим с" msgid "Share with link" msgstr "Опубликовать с ссылкой" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Защитить паролем" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Пароль" @@ -218,7 +218,7 @@ msgstr "" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Отправить" #: js/share.js:177 msgid "Set expiration date" @@ -272,25 +272,25 @@ msgstr "удалить" msgid "share" msgstr "сделать общим" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "Пароль защищен" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "Ошибка при отключении даты истечения срока действия" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "Ошибка при установке даты истечения срока действия" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Отправка ..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "Письмо отправлено" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -312,8 +312,8 @@ msgstr "Сброс отправки email." msgid "Request failed!" msgstr "Не удалось выполнить запрос!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Имя пользователя" @@ -402,44 +402,44 @@ msgstr "Ваши каталоги данных и файлы, вероятно, msgid "Create an <strong>admin account</strong>" msgstr "Создать <strong>admin account</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Расширенный" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Папка данных" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Настроить базу данных" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "будет использоваться" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Пользователь базы данных" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Пароль базы данных" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Имя базы данных" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Табличная область базы данных" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Сервер базы данных" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Завершение настройки" @@ -545,11 +545,11 @@ msgstr "Пожалуйста, измените пароль, чтобы защи msgid "Lost your password?" msgstr "Забыли пароль?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "запомнить" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Войти" diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po index b330223c8c2..acd6779fcd6 100644 --- a/l10n/ru_RU/files.po +++ b/l10n/ru_RU/files.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-01 00:01+0100\n" -"PO-Revision-Date: 2012-11-30 23:02+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 07:59+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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" @@ -26,7 +26,7 @@ msgstr "Ошибка отсутствует, файл загружен успе #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:" #: ajax/upload.php:23 msgid "" @@ -54,11 +54,11 @@ msgstr "Не удалось записать на диск" msgid "Files" msgstr "Файлы" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" msgstr "Скрыть" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Удалить" @@ -66,39 +66,39 @@ msgstr "Удалить" msgid "Rename" msgstr "Переименовать" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" msgstr "{новое_имя} уже существует" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" msgstr "отмена" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" msgstr "подобрать название" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "отменить" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" msgstr "заменено {новое_имя}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" msgstr "отменить действие" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" msgstr "заменено {новое_имя} с {старое_имя}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" msgstr "Cовместное использование прекращено {файлы}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" msgstr "удалено {файлы}" @@ -108,80 +108,80 @@ msgid "" "allowed." msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "Создание ZIP-файла, это может занять некоторое время." -#: js/files.js:218 +#: js/files.js:209 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией" -#: js/files.js:218 +#: js/files.js:209 msgid "Upload Error" msgstr "Ошибка загрузки" -#: js/files.js:235 +#: js/files.js:226 msgid "Close" msgstr "Закрыть" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:245 js/files.js:359 js/files.js:389 msgid "Pending" msgstr "Ожидающий решения" -#: js/files.js:274 +#: js/files.js:265 msgid "1 file uploading" msgstr "загрузка 1 файла" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:268 js/files.js:322 js/files.js:337 msgid "{count} files uploading" msgstr "{количество} загружено файлов" -#: js/files.js:349 js/files.js:382 +#: js/files.js:340 js/files.js:373 msgid "Upload cancelled." msgstr "Загрузка отменена" -#: js/files.js:451 +#: js/files.js:442 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена." -#: js/files.js:523 +#: js/files.js:512 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" msgstr "Некорректное имя папки. Нименование \"Опубликовано\" зарезервировано ownCloud" -#: js/files.js:704 +#: js/files.js:693 msgid "{count} files scanned" msgstr "{количество} файлов отсканировано" -#: js/files.js:712 +#: js/files.js:701 msgid "error while scanning" msgstr "ошибка при сканировании" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:774 templates/index.php:66 msgid "Name" msgstr "Имя" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:775 templates/index.php:77 msgid "Size" msgstr "Размер" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:776 templates/index.php:79 msgid "Modified" msgstr "Изменен" -#: js/files.js:814 +#: js/files.js:803 msgid "1 folder" msgstr "1 папка" -#: js/files.js:816 +#: js/files.js:805 msgid "{count} folders" msgstr "{количество} папок" -#: js/files.js:824 +#: js/files.js:813 msgid "1 file" msgstr "1 файл" -#: js/files.js:826 +#: js/files.js:815 msgid "{count} files" msgstr "{количество} файлов" @@ -241,28 +241,28 @@ msgstr "Загрузить " msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Здесь ничего нет. Загрузите что-нибудь!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Загрузить" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Загрузка слишком велика" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Файлы сканируются, пожалуйста, подождите." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "Текущее сканирование" diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po index f82e872da95..66ab6707a11 100644 --- a/l10n/ru_RU/files_external.po +++ b/l10n/ru_RU/files_external.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-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 11:24+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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" @@ -46,14 +46,14 @@ msgstr "Ошибка настройки хранилища Google Drive" msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Предупреждение:</b> \"smbclient\" не установлен. Mounting of CIFS/SMB shares is not possible. Пожалуйста, обратитесь к системному администратору, чтобы установить его." #: lib/config.php:435 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "" +msgstr "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po index fabcb827160..74fe2bec5ae 100644 --- a/l10n/ru_RU/settings.po +++ b/l10n/ru_RU/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-03 00:04+0100\n" -"PO-Revision-Date: 2012-12-02 03:18+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-19 00:03+0100\n" +"PO-Revision-Date: 2012-12-18 08:06+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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" @@ -68,7 +68,7 @@ msgstr "Язык изменен" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "Администраторы не могут удалить сами себя из группы администраторов" #: ajax/togglegroups.php:28 #, php-format diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po index a66fb2f7962..4a514279ab3 100644 --- a/l10n/ru_RU/user_ldap.po +++ b/l10n/ru_RU/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-10-16 02:03+0200\n" -"PO-Revision-Date: 2012-10-15 13:57+0000\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" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них." + +#: templates/settings.php:11 +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 не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его." + +#: templates/settings.php:15 msgid "Host" msgstr "Хост" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "База DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN пользователя" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Пароль" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Фильтр имен пользователей" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Фильтр списка пользователей" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Задает фильтр, применяемый при получении пользователей." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "без каких-либо заполнителей, например, \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Групповой фильтр" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Задает фильтр, применяемый при получении групп." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Порт" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Базовое дерево пользователей" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Базовое дерево групп" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Связь член-группа" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Использовать TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Не используйте это SSL-соединений, это не будет выполнено." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Нечувствительный к регистру LDAP-сервер (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Выключить проверку сертификата SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Не рекомендовано, используйте только для тестирования." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Поле, отображаемое как имя пользователя" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Поле, отображаемое как имя группы" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "в байтах" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "в секундах. Изменение очищает кэш." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Помощь" diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po index 065c1358f95..f44ac30b3ea 100644 --- a/l10n/si_LK/user_ldap.po +++ b/l10n/si_LK/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-10-27 00:01+0200\n" -"PO-Revision-Date: 2012-10-26 06:00+0000\n" -"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "සත්කාරකය" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "SSL අවශ්යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "මුර පදය" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "පරිශීලක පිවිසුම් පෙරහන" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "පරිශීලක ලැයිස්තු පෙරහන" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "කණ්ඩායම් පෙරහන" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "තොට" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "TLS භාවිතා කරන්න" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "උදව්" diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index b11bc381cc6..fde4a583528 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/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-10-26 02:02+0200\n" -"PO-Revision-Date: 2012-10-25 19:25+0000\n" -"Last-Translator: Roman Priesol <roman@priesol.net>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Hostiteľ" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Základné DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Používateľské DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Heslo" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filter prihlásenia používateľov" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filter zoznamov používateľov" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definuje použitý filter, pre získanie používateľov." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "bez zástupných znakov, napr. \"objectClass=person\"" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filter skupiny" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definuje použitý filter, pre získanie skupín." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Základný používateľský strom" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Základný skupinový strom" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Asociácia člena skupiny" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Použi TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Nepoužívajte pre pripojenie SSL, pripojenie zlyhá." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Vypnúť overovanie SSL certifikátu." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Nie je doporučované, len pre testovacie účely." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Pole pre zobrazenia mena používateľa" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud " -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Pole pre zobrazenie mena skupiny" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud " -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "v bajtoch" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Pomoc" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index c792cfeb4b2..679277649aa 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-16 00:11+0100\n" +"PO-Revision-Date: 2012-12-15 16:29+0000\n" +"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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" @@ -24,26 +24,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Uporanik %s je dal datoteko v souporabo z vami" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Uporanik %s je dal mapo v souporabo z vami" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %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 "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -210,18 +210,18 @@ msgstr "Omogoči souporabo s povezavo" msgid "Password protect" msgstr "Zaščiti z geslom" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "Geslo" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Posreduj povezavo po e-pošti" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Pošlji" #: js/share.js:177 msgid "Set expiration date" @@ -289,11 +289,11 @@ msgstr "Napaka med nastavljanjem datuma preteka" #: js/share.js:568 msgid "Sending ..." -msgstr "" +msgstr "Pošiljam ..." #: js/share.js:579 msgid "Email sent" -msgstr "" +msgstr "E-pošta je bila poslana" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -315,8 +315,8 @@ msgstr "E-pošta za ponastavitev je bila poslana." msgid "Request failed!" msgstr "Zahtevek je spodletel!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "Uporabniško Ime" @@ -405,44 +405,44 @@ msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen msgid "Create an <strong>admin account</strong>" msgstr "Ustvari <strong>skrbniški račun</strong>" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Napredne možnosti" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Mapa s podatki" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Nastavi podatkovno zbirko" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "bo uporabljen" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Uporabnik zbirke" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Geslo podatkovne zbirke" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Ime podatkovne zbirke" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Razpredelnica podatkovne zbirke" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Gostitelj podatkovne zbirke" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Dokončaj namestitev" @@ -548,11 +548,11 @@ msgstr "Spremenite geslo za izboljšanje zaščite računa." msgid "Lost your password?" msgstr "Ali ste pozabili geslo?" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "Zapomni si me" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "Prijava" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index 850dcb05426..f20fb0bad26 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.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-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-16 00:11+0100\n" +"PO-Revision-Date: 2012-12-15 16:43+0000\n" +"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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" @@ -47,14 +47,14 @@ msgstr "Napaka nastavljanja shrambe Google Drive" msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti." #: lib/config.php:435 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "" +msgstr "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index 115d6bd0b72..d34b56f8c01 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-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 17:41+0000\n" -"Last-Translator: mateju <>\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" "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" @@ -20,153 +20,166 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Opozorilo:</b> 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." + +#: 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." + +#: templates/settings.php:15 msgid "Host" msgstr "Gostitelj" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Osnovni DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Uporabnik DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Geslo" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Za anonimni dostop sta polji DN in geslo prazni." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filter prijav uporabnikov" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filter seznama uporabnikov" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Določi filter za uporabo med pridobivanjem uporabnikov." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Filter skupin" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Določi filter za uporabo med pridobivanjem skupin." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Vrata" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Osnovno uporabniško drevo" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Osnovno drevo skupine" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Povezava člana skupine" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Uporabi TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Uporaba SSL za povezave bo spodletela." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Onemogoči potrditev veljavnosti potrdila SSL." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Polje za uporabnikovo prikazano ime" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Polje za prikazano ime skupine" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "v bajtih" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "v sekundah. Sprememba izprazni predpomnilnik." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Pomoč" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po index 16fd4ec4207..3c0afbd378a 100644 --- a/l10n/sq/user_ldap.po +++ b/l10n/sq/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: 2012-11-27 00:10+0100\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po index eaf9622b4f7..2af4aa92fab 100644 --- a/l10n/sr/user_ldap.po +++ b/l10n/sr/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index 6f56c8e03d0..47549f334d5 100644 --- a/l10n/sr@latin/user_ldap.po +++ b/l10n/sr@latin/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index 5bab62c0342..76ca9c76224 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -8,164 +8,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-29 09:37+0000\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" "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" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom." + +#: templates/settings.php:11 +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." + +#: templates/settings.php:15 msgid "Host" msgstr "Server" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Start DN" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Användare DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Lösenord" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "För anonym åtkomst, lämna DN och lösenord tomt." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Filter logga in användare" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "använd platshållare %%uid, t ex \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Filter lista användare" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Definierar filter att tillämpa vid listning av användare." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "utan platshållare, t.ex. \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Gruppfilter" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definierar filter att tillämpa vid listning av grupper." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Port" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Bas för användare i katalogtjänst" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Bas för grupper i katalogtjänst" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Attribut för gruppmedlemmar" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Använd TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Använd inte för SSL-anslutningar, det kommer inte att fungera." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Stäng av verifiering av SSL-certifikat." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Rekommenderas inte, använd bara för test. " -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Attribut för användarnamn" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Attribut som används för att generera användarnamn i ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Attribut för gruppnamn" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Attribut som används för att generera gruppnamn i ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "i bytes" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "i sekunder. En förändring tömmer cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Hjälp" diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po index 2cd27957467..e98a09afa8c 100644 --- a/l10n/ta_LK/user_ldap.po +++ b/l10n/ta_LK/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-11-21 00:01+0100\n" -"PO-Revision-Date: 2012-11-20 09:09+0000\n" -"Last-Translator: suganthi <suganthi@nic.lk>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "ஓம்புனர்" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "தள DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் " -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "பயனாளர் DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "கடவுச்சொல்" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "துறை " -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "தள பயனாளர் மரம்" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "தள குழு மரம்" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "குழு உறுப்பினர் சங்கம்" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "TLS ஐ பயன்படுத்தவும்" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "SSL இணைப்பிற்கு பயன்படுத்தவேண்டாம், அது தோல்வியடையும்." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "பயனாளர் காட்சிப்பெயர் புலம்" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "குழுவின் காட்சி பெயர் புலம் " -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "bytes களில் " -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "உதவி" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 74a33fc3ddd..10905d6f905 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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" @@ -161,8 +161,8 @@ msgid "The object type is not specified." msgstr "" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "" @@ -174,7 +174,7 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "" @@ -202,11 +202,11 @@ msgstr "" msgid "Share with link" msgstr "" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:26 #: templates/verify.php:13 msgid "Password" msgstr "" @@ -271,23 +271,23 @@ msgstr "" msgid "share" msgstr "" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." msgstr "" -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" msgstr "" @@ -311,8 +311,8 @@ msgstr "" msgid "Request failed!" msgstr "" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:21 msgid "Username" msgstr "" @@ -401,44 +401,44 @@ msgstr "" msgid "Create an <strong>admin account</strong>" msgstr "" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "" @@ -544,11 +544,11 @@ msgstr "" msgid "Lost your password?" msgstr "" -#: templates/login.php:27 +#: templates/login.php:29 msgid "remember" msgstr "" -#: templates/login.php:28 +#: templates/login.php:30 msgid "Log in" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 8c56249c2da..a6b3d12b964 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 15063c507e8..b68931a6b55 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 5ae592eab3e..66472769286 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 c43a5b97938..18b11e12304 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 89da014ec69..9fd76727d8d 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 1a2475ddde0..faea81edd90 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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" @@ -41,19 +41,19 @@ msgstr "" msgid "Admin" msgstr "" -#: files.php:361 +#: files.php:366 msgid "ZIP download is turned off." msgstr "" -#: files.php:362 +#: files.php:367 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:362 files.php:387 +#: files.php:367 files.php:392 msgid "Back to Files" msgstr "" -#: files.php:386 +#: files.php:391 msgid "Selected files too large to generate zip file." msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 4606b3de7ef..25dec8fd9a5 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: 2012-12-14 00:17+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 f6c93d44d74..61376c6d808 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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" @@ -18,151 +18,164 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may " +"experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. uid=agent," "dc=example,dc=com. For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index edd944b0698..3c6b785b90b 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: 2012-12-14 00:16+0100\n" +"POT-Creation-Date: 2012-12-19 00:03+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 64ad07dbf6e..c8a7bd651bd 100644 --- a/l10n/th_TH/user_ldap.po +++ b/l10n/th_TH/user_ldap.po @@ -8,164 +8,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-29 18:29+0000\n" -"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: th_TH\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "โฮสต์" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN ฐาน" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN ของผู้ใช้งาน" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "รหัสผ่าน" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\"," -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "ตัวกรองข้อมูลกลุ่ม" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\"," -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "พอร์ต" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "รายการผู้ใช้งานหลักแบบ Tree" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "รายการกลุ่มหลักแบบ Tree" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "ใช้ TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "ในหน่วยไบต์" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "ช่วยเหลือ" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 5429c2cff89..da2eff7ebaa 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -7,164 +7,177 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index dd12c4f2b25..b6601497ecb 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -4,12 +4,13 @@ # # Translators: # <victor.dubiniuk@gmail.com>, 2012. +# <volodya327@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" -"PO-Revision-Date: 2012-11-27 12:54+0000\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" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -19,153 +20,166 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них." + +#: templates/settings.php:11 +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 не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його." + +#: templates/settings.php:15 msgid "Host" msgstr "Хост" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Базовий DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "DN Користувача" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Пароль" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Для анонімного доступу, залиште DN і Пароль порожніми." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Фільтр Користувачів, що під'єднуються" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Фільтр Списку Користувачів" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Визначає фільтр, який застосовується при отриманні користувачів" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Фільтр Груп" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Визначає фільтр, який застосовується при отриманні груп." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Порт" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Основне Дерево Користувачів" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Основне Дерево Груп" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Асоціація Група-Член" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Використовуйте TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Не використовуйте його для SSL з'єднань, це не буде виконано." -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Нечутливий до регістру LDAP сервер (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Вимкнути перевірку SSL сертифіката." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Не рекомендується, використовуйте лише для тестів." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Поле, яке відображає Ім'я Користувача" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Поле, яке відображає Ім'я Групи" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "в байтах" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "в секундах. Зміна очищує кеш." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD." -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Допомога" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index 7f60127a8f9..c6157201e51 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/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-11-10 00:01+0100\n" -"PO-Revision-Date: 2012-11-09 14:01+0000\n" -"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,153 +20,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "Máy chủ" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "DN cơ bản" -#: templates/settings.php:9 +#: 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" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "Người dùng DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống." -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "Mật khẩu" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống." -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "Lọc người dùng đăng nhập" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập." -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "use %%uid placeholder, e.g. \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "Lọc danh sách thành viên" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng." -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "Bộ lọc nhóm" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"." -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "Cổng" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "Cây người dùng cơ bản" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "Cây nhóm cơ bản" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "Nhóm thành viên Cộng đồng" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "Sử dụng TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "Kết nối SSL bị lỗi. " -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "Trường hợp insensitve LDAP máy chủ (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "Tắt xác thực chứng nhận SSL" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL trong máy chủ ownCloud của bạn." -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm." -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "Hiển thị tên người sử dụng" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud." -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "Hiển thị tên nhóm" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud." -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "Theo Byte" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache." -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "Giúp đỡ" diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po index 119c7188675..75ea9d9c0e9 100644 --- a/l10n/zh_CN.GB2312/user_ldap.po +++ b/l10n/zh_CN.GB2312/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-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-17 12:39+0000\n" -"Last-Translator: marguerite su <i@marguerite.su>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "主机" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "基本判别名" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "您可以在高级选项卡中为用户和群组指定基本判别名" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "用户判别名" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "密码" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "匿名访问请留空判别名和密码。" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "用户登录过滤器" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\"" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "用户列表过滤器" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "定义撷取用户时要应用的过滤器。" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "不能使用占位符，例如 \"objectClass=person\"。" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "群组过滤器" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "定义撷取群组时要应用的过滤器" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "端口" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "基本用户树" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "基本群组树" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "群组-成员组合" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "使用 TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "不要使用它进行 SSL 连接，会失败的。" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "大小写不敏感的 LDAP 服务器 (Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "关闭 SSL 证书校验。" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "不推荐，仅供测试" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "用户显示名称字段" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "群组显示名称字段" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "以字节计" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "以秒计。修改会清空缓存。" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "帮助" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index 00e887720fd..be239585259 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/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-10-24 02:02+0200\n" -"PO-Revision-Date: 2012-10-23 05:22+0000\n" -"Last-Translator: hanfeng <appweb.cn@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "主机" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "Base DN" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "您可以在高级选项卡里为用户和组指定Base DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "User DN" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "密码" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "启用匿名访问，将DN和密码保留为空" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "用户登录过滤" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "使用 %%uid作为占位符，例如“uid=%%uid”" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "用户列表过滤" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "定义拉取用户时的过滤器" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "没有任何占位符,如 \"objectClass=person\"." -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "组过滤" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "定义拉取组信息时的过滤器" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "无需占位符，例如\"objectClass=posixGroup\"" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "端口" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "基础用户树" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "基础组树" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "组成员关联" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "使用TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "不要在SSL链接中使用此选项，会导致失败。" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "大小写敏感LDAP服务器(Windows)" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "关闭SSL证书验证" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "暂不推荐，仅供测试" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "用户显示名称字段" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "用来生成用户的ownCloud名称的 LDAP属性" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "组显示名称字段" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "用来生成组的ownCloud名称的LDAP属性" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "字节数" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "帮助" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index b59ebba9006..24846079f01 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/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: 2012-11-19 00:01+0100\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index ca4a4be144c..2bf0669ac23 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/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-11-28 00:10+0100\n" -"PO-Revision-Date: 2012-11-27 14:32+0000\n" -"Last-Translator: dw4dev <dw4dev@gmail.com>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,153 +19,166 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "密碼" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "使用TLS" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "關閉 SSL 憑證驗證" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "說明" diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po index a4f2985ab0e..3add8a2631e 100644 --- a/l10n/zu_ZA/user_ldap.po +++ b/l10n/zu_ZA/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: 2012-11-06 00:00+0100\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-15 00:11+0100\n" +"PO-Revision-Date: 2012-12-14 23:11+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,153 +18,166 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +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 "" + +#: templates/settings.php:15 msgid "Host" msgstr "" -#: templates/settings.php:8 +#: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "Base DN" msgstr "" -#: templates/settings.php:9 +#: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "User DN" msgstr "" -#: templates/settings.php:10 +#: templates/settings.php:17 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "Password" msgstr "" -#: templates/settings.php:11 +#: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 msgid "User Login Filter" msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:12 +#: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "User List Filter" msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:13 +#: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Group Filter" msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:14 +#: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:17 +#: templates/settings.php:24 msgid "Port" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:25 msgid "Base User Tree" msgstr "" -#: templates/settings.php:19 +#: templates/settings.php:26 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:20 +#: templates/settings.php:27 msgid "Group-Member association" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Use TLS" msgstr "" -#: templates/settings.php:21 +#: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." msgstr "" -#: templates/settings.php:22 +#: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:24 +#: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:34 msgid "in bytes" msgstr "" -#: templates/settings.php:29 +#: templates/settings.php:36 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:39 msgid "Help" msgstr "" diff --git a/lib/app.php b/lib/app.php index 5d4fbbd9c23..be6d5ab3dd3 100755 --- a/lib/app.php +++ b/lib/app.php @@ -597,16 +597,16 @@ class OC_App{ $app1[$i]['internal'] = $app1[$i]['active'] = 0; // rating img - if($app['score']>=0 and $app['score']<5) $img=OC_Helper::imagePath( "core", "rating/s1.png" ); - elseif($app['score']>=5 and $app['score']<15) $img=OC_Helper::imagePath( "core", "rating/s2.png" ); - elseif($app['score']>=15 and $app['score']<25) $img=OC_Helper::imagePath( "core", "rating/s3.png" ); - elseif($app['score']>=25 and $app['score']<35) $img=OC_Helper::imagePath( "core", "rating/s4.png" ); - elseif($app['score']>=35 and $app['score']<45) $img=OC_Helper::imagePath( "core", "rating/s5.png" ); - elseif($app['score']>=45 and $app['score']<55) $img=OC_Helper::imagePath( "core", "rating/s6.png" ); - elseif($app['score']>=55 and $app['score']<65) $img=OC_Helper::imagePath( "core", "rating/s7.png" ); - elseif($app['score']>=65 and $app['score']<75) $img=OC_Helper::imagePath( "core", "rating/s8.png" ); - elseif($app['score']>=75 and $app['score']<85) $img=OC_Helper::imagePath( "core", "rating/s9.png" ); - elseif($app['score']>=85 and $app['score']<95) $img=OC_Helper::imagePath( "core", "rating/s10.png" ); + if($app['score']>=0 and $app['score']<5) $img=OC_Helper::imagePath( "core", "rating/s1.png" ); + elseif($app['score']>=5 and $app['score']<15) $img=OC_Helper::imagePath( "core", "rating/s2.png" ); + elseif($app['score']>=15 and $app['score']<25) $img=OC_Helper::imagePath( "core", "rating/s3.png" ); + elseif($app['score']>=25 and $app['score']<35) $img=OC_Helper::imagePath( "core", "rating/s4.png" ); + elseif($app['score']>=35 and $app['score']<45) $img=OC_Helper::imagePath( "core", "rating/s5.png" ); + elseif($app['score']>=45 and $app['score']<55) $img=OC_Helper::imagePath( "core", "rating/s6.png" ); + elseif($app['score']>=55 and $app['score']<65) $img=OC_Helper::imagePath( "core", "rating/s7.png" ); + elseif($app['score']>=65 and $app['score']<75) $img=OC_Helper::imagePath( "core", "rating/s8.png" ); + elseif($app['score']>=75 and $app['score']<85) $img=OC_Helper::imagePath( "core", "rating/s9.png" ); + elseif($app['score']>=85 and $app['score']<95) $img=OC_Helper::imagePath( "core", "rating/s10.png" ); elseif($app['score']>=95 and $app['score']<100) $img=OC_Helper::imagePath( "core", "rating/s11.png" ); $app1[$i]['score'] = '<img src="'.$img.'"> Score: '.$app['score'].'%'; diff --git a/lib/base.php b/lib/base.php index 0b75f6f085e..9cdadbb7991 100644 --- a/lib/base.php +++ b/lib/base.php @@ -474,6 +474,11 @@ class OC{ 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); + } } /** diff --git a/lib/db.php b/lib/db.php index 6524db7581a..7e60b41d230 100644 --- a/lib/db.php +++ b/lib/db.php @@ -445,9 +445,9 @@ class OC_DB { * http://www.sqlite.org/lang_createtable.html * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm */ - if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't - $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content ); - } + if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't + $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content ); + } file_put_contents( $file2, $content ); diff --git a/lib/filecache.php b/lib/filecache.php index bbf55bc1f86..c3256c783e6 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -355,7 +355,7 @@ class OC_FileCache{ if($sizeDiff==0) return; $item = OC_FileCache_Cached::get($path); //stop walking up the filetree if we hit a non-folder or reached to root folder - if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory'){ + if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory') { return; } $id = $item['id']; @@ -363,13 +363,13 @@ class OC_FileCache{ $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?'); $query->execute(array($sizeDiff, $id)); $path=dirname($path); - if($path == '' or $path =='/'){ + if($path == '' or $path =='/') { return; } $parent = OC_FileCache_Cached::get($path); $id = $parent['id']; //stop walking up the filetree if we hit a non-folder - if($parent['mimetype'] !== 'httpd/unix-directory'){ + if($parent['mimetype'] !== 'httpd/unix-directory') { return; } } diff --git a/lib/files.php b/lib/files.php index b4a4145a493..69097e41074 100644 --- a/lib/files.php +++ b/lib/files.php @@ -197,7 +197,12 @@ class OC_Files { } OC_Util::obEnd(); if($zip or OC_Filesystem::is_readable($filename)) { - header('Content-Disposition: attachment; filename="'.basename($filename).'"'); + if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) { + header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' ); + } else { + header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) ) + . '; filename="' . rawurlencode( basename($filename) ) . '"' ); + } header('Content-Transfer-Encoding: binary'); OC_Response::disableCaching(); if($zip) { @@ -207,6 +212,7 @@ class OC_Files { self::addSendfileHeader($filename); }else{ header('Content-Type: '.OC_Filesystem::getMimeType($filename)); + header("Content-Length: ".OC_Filesystem::filesize($filename)); $storage = OC_Filesystem::getStorage($filename); if ($storage instanceof OC_Filestorage_Local) { self::addSendfileHeader(OC_Filesystem::getLocalFile($filename)); @@ -222,8 +228,6 @@ class OC_Files { die('403 Forbidden'); } if($only_header) { - if(!$zip) - header("Content-Length: ".OC_Filesystem::filesize($filename)); return ; } if($zip) { @@ -492,7 +496,9 @@ class OC_Files { if(is_writable(OC::$SERVERROOT.'/.htaccess')) { file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess); return OC_Helper::computerFileSize($size); - } else { OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN); } + } else { + OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN); + } return false; } diff --git a/lib/helper.php b/lib/helper.php index 5dec7fadfb4..be4e4e52677 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -540,7 +540,7 @@ class OC_Helper { mkdir($tmpDirNoClean); } $file=$tmpDirNoClean.md5(time().rand()).$postfix; - $fh=fopen($file,'w'); + $fh=fopen($file, 'w'); fclose($fh); return $file; } diff --git a/lib/hook.php b/lib/hook.php index 26a53693748..4da331bb5d8 100644 --- a/lib/hook.php +++ b/lib/hook.php @@ -59,7 +59,11 @@ class OC_Hook{ // Call all slots foreach( self::$registered[$signalclass][$signalname] as $i ) { - call_user_func( array( $i["class"], $i["name"] ), $params ); + try { + call_user_func( array( $i["class"], $i["name"] ), $params ); + } catch (Exception $e){ + OC_Log::write('hook', 'error while running hook (' . $i["class"] . '::' . $i["name"] . '): '.$e->getMessage(), OC_Log::ERROR); + } } // return true diff --git a/lib/l10n.php b/lib/l10n.php index b83d8ff86db..f70dfa5e34e 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -115,10 +115,12 @@ class OC_L10N{ $i18ndir = self::findI18nDir($app); // Localization is in /l10n, Texts are in $i18ndir // (Just no need to define date/time format etc. twice) - if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || - OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || - OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') || - OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) { + if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') + || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') + || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') + || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings') + ) + && file_exists($i18ndir.$lang.'.php')) { // Include the file, save the data from $CONFIG include strip_tags($i18ndir).strip_tags($lang).'.php'; if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) { @@ -294,12 +296,12 @@ class OC_L10N{ } foreach($accepted_languages as $i) { $temp = explode(';', $i); - $temp[0] = str_replace('-','_',$temp[0]); + $temp[0] = str_replace('-', '_', $temp[0]); if( ($key = array_search($temp[0], $available)) !== false) { return $available[$key]; } foreach($available as $l) { - if ( $temp[0] == substr($l,0,2) ) { + if ( $temp[0] == substr($l, 0, 2) ) { return $l; } } diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php index a06073e808a..5b3efffb22a 100644 --- a/lib/l10n/mk.php +++ b/lib/l10n/mk.php @@ -3,6 +3,32 @@ "Personal" => "Лично", "Settings" => "Параметри", "Users" => "Корисници", +"Apps" => "Аппликации", +"Admin" => "Админ", +"ZIP download is turned off." => "Преземање во ZIP е исклучено", +"Files need to be downloaded one by one." => "Датотеките треба да се симнат една по една.", +"Back to Files" => "Назад кон датотеки", +"Selected files too large to generate zip file." => "Избраните датотеки се преголеми за да се генерира zip.", +"Application is not enabled" => "Апликацијата не е овозможена", +"Authentication error" => "Грешка во автентикација", +"Token expired. Please reload page." => "Жетонот е истечен. Ве молам превчитајте ја страницата.", "Files" => "Датотеки", -"Text" => "Текст" +"Text" => "Текст", +"Images" => "Слики", +"seconds ago" => "пред секунди", +"1 minute ago" => "пред 1 минута", +"%d minutes ago" => "пред %d минути", +"1 hour ago" => "пред 1 час", +"%d hours ago" => "пред %d часови", +"today" => "денеска", +"yesterday" => "вчера", +"%d days ago" => "пред %d денови", +"last month" => "минатиот месец", +"%d months ago" => "пред %d месеци", +"last year" => "минатата година", +"years ago" => "пред години", +"%s is available. Get <a href=\"%s\">more information</a>" => "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>", +"up to date" => "ажурно", +"updates check is disabled" => "проверката за ажурирања е оневозможена", +"Could not find category \"%s\"" => "Не можам да најдам категорија „%s“" ); diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php index ec43208d833..e53dd5fefcd 100644 --- a/lib/log/owncloud.php +++ b/lib/log/owncloud.php @@ -33,8 +33,11 @@ class OC_Log_Owncloud { * Init class data */ public static function init() { - $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ); - self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' ); + $defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log'; + self::$logFile = OC_Config::getValue("logfile", $defaultLogFile); + if (!file_exists(self::$logFile)) { + self::$logFile = $defaultLogFile; + } } /** @@ -47,9 +50,11 @@ class OC_Log_Owncloud { $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR); if($level>=$minLevel) { $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time()); - $fh=fopen(self::$logFile, 'a'); - fwrite($fh, json_encode($entry)."\n"); - fclose($fh); + $handle = @fopen(self::$logFile, 'a'); + if ($handle) { + fwrite($handle, json_encode($entry)."\n"); + fclose($handle); + } } } diff --git a/lib/migrate.php b/lib/migrate.php index 2cc0a3067b8..5ff8e338a44 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -78,67 +78,67 @@ class OC_Migrate{ * @param otional $path string path to zip output folder * @return false on error, path to zip on success */ - public static function export( $uid=null, $type='user', $path=null ) { + public static function export( $uid=null, $type='user', $path=null ) { $datadir = OC_Config::getValue( 'datadirectory' ); - // Validate export type - $types = array( 'user', 'instance', 'system', 'userfiles' ); - if( !in_array( $type, $types ) ) { - OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR ); - return json_encode( array( 'success' => false ) ); - } - self::$exporttype = $type; - // Userid? - if( self::$exporttype == 'user' ) { - // Check user exists - self::$uid = is_null($uid) ? OC_User::getUser() : $uid; - if(!OC_User::userExists(self::$uid)) { - return json_encode( array( 'success' => false) ); - } - } - // Calculate zipname - if( self::$exporttype == 'user' ) { - $zipname = 'oc_export_' . self::$uid . '_' . date("y-m-d_H-i-s") . '.zip'; - } else { - $zipname = 'oc_export_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '.zip'; - } - // Calculate path - if( self::$exporttype == 'user' ) { - self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname; - } else { - if( !is_null( $path ) ) { - // Validate custom path - if( !file_exists( $path ) || !is_writeable( $path ) ) { - OC_Log::write( 'migration', 'Path supplied is invalid.', OC_Log::ERROR ); - return json_encode( array( 'success' => false ) ); - } - self::$zippath = $path . $zipname; - } else { - // Default path - self::$zippath = get_temp_dir() . '/' . $zipname; - } - } - // Create the zip object - if( !self::createZip() ) { - return json_encode( array( 'success' => false ) ); - } - // Do the export - self::findProviders(); - $exportdata = array(); - switch( self::$exporttype ) { - case 'user': - // Connect to the db - self::$dbpath = $datadir . '/' . self::$uid . '/migration.db'; - if( !self::connectDB() ) { - return json_encode( array( 'success' => false ) ); - } - self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 ); - // Export the app info - $exportdata = self::exportAppData(); + // Validate export type + $types = array( 'user', 'instance', 'system', 'userfiles' ); + if( !in_array( $type, $types ) ) { + OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR ); + return json_encode( array( 'success' => false ) ); + } + self::$exporttype = $type; + // Userid? + if( self::$exporttype == 'user' ) { + // Check user exists + self::$uid = is_null($uid) ? OC_User::getUser() : $uid; + if(!OC_User::userExists(self::$uid)) { + return json_encode( array( 'success' => false) ); + } + } + // Calculate zipname + if( self::$exporttype == 'user' ) { + $zipname = 'oc_export_' . self::$uid . '_' . date("y-m-d_H-i-s") . '.zip'; + } else { + $zipname = 'oc_export_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '.zip'; + } + // Calculate path + if( self::$exporttype == 'user' ) { + self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname; + } else { + if( !is_null( $path ) ) { + // Validate custom path + if( !file_exists( $path ) || !is_writeable( $path ) ) { + OC_Log::write( 'migration', 'Path supplied is invalid.', OC_Log::ERROR ); + return json_encode( array( 'success' => false ) ); + } + self::$zippath = $path . $zipname; + } else { + // Default path + self::$zippath = get_temp_dir() . '/' . $zipname; + } + } + // Create the zip object + if( !self::createZip() ) { + return json_encode( array( 'success' => false ) ); + } + // Do the export + self::findProviders(); + $exportdata = array(); + switch( self::$exporttype ) { + case 'user': + // Connect to the db + self::$dbpath = $datadir . '/' . self::$uid . '/migration.db'; + if( !self::connectDB() ) { + return json_encode( array( 'success' => false ) ); + } + self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 ); + // Export the app info + $exportdata = self::exportAppData(); // Add the data dir to the zip self::$content->addDir(OC_User::getHome(self::$uid), true, '/' ); - break; - case 'instance': - self::$content = new OC_Migration_Content( self::$zip ); + break; + case 'instance': + self::$content = new OC_Migration_Content( self::$zip ); // Creates a zip that is compatable with the import function $dbfile = tempnam( get_temp_dir(), "owncloud_export_data_" ); OC_DB::getDbStructure( $dbfile, 'MDB2_SCHEMA_DUMP_ALL'); @@ -155,32 +155,32 @@ class OC_Migrate{ foreach(OC_User::getUsers() as $user) { self::$content->addDir(OC_User::getHome($user), true, "/userdata/" ); } - break; + break; case 'userfiles': self::$content = new OC_Migration_Content( self::$zip ); // Creates a zip with all of the users files foreach(OC_User::getUsers() as $user) { self::$content->addDir(OC_User::getHome($user), true, "/" ); } - break; + break; case 'system': self::$content = new OC_Migration_Content( self::$zip ); // Creates a zip with the owncloud system files self::$content->addDir( OC::$SERVERROOT . '/', false, '/'); foreach (array(".git", "3rdparty", "apps", "core", "files", "l10n", "lib", "ocs", "search", "settings", "tests") as $dir) { - self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/"); + self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/"); } - break; - } - if( !$info = self::getExportInfo( $exportdata ) ) { - return json_encode( array( 'success' => false ) ); - } - // Add the export info json to the export zip - self::$content->addFromString( $info, 'export_info.json' ); - if( !self::$content->finish() ) { - return json_encode( array( 'success' => false ) ); - } - return json_encode( array( 'success' => true, 'data' => self::$zippath ) ); + break; + } + if( !$info = self::getExportInfo( $exportdata ) ) { + return json_encode( array( 'success' => false ) ); + } + // Add the export info json to the export zip + self::$content->addFromString( $info, 'export_info.json' ); + if( !self::$content->finish() ) { + return json_encode( array( 'success' => false ) ); + } + return json_encode( array( 'success' => true, 'data' => self::$zippath ) ); } /** @@ -254,7 +254,7 @@ class OC_Migrate{ OC_Log::write( 'migration', 'Failed to delete the extracted zip', OC_Log::ERROR ); } return json_encode( array( 'success' => true, 'data' => $appsimported ) ); - break; + break; case 'instance': /* * EXPERIMENTAL @@ -281,7 +281,7 @@ class OC_Migrate{ // Done return json_encode( array( 'success' => true ) ); */ - break; + break; } } @@ -319,10 +319,10 @@ class OC_Migrate{ static private function extractZip( $path ) { self::$zip = new ZipArchive; // Validate path - if( !file_exists( $path ) ) { - OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR ); - return false; - } + if( !file_exists( $path ) ) { + OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR ); + return false; + } if ( self::$zip->open( $path ) != true ) { OC_Log::write( 'migration', "Failed to open zip file", OC_Log::ERROR ); return false; @@ -555,9 +555,9 @@ class OC_Migrate{ if ( self::$zip->open( self::$zippath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE ) !== true ) { OC_Log::write('migration', 'Failed to create the zip with error: '.self::$zip->getStatusString(), OC_Log::ERROR); return false; - } else { - return true; - } + } else { + return true; + } } /** diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 12e5026a877..24081425f1e 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -44,10 +44,10 @@ class OC_OCSClient{ * @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); - } + private static function getKBURL() { + $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1'); + return($url); + } /** * @brief Get the content of an OCS url call. diff --git a/lib/public/contacts.php b/lib/public/contacts.php index 4cf57ed8ff2..88d812e735a 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -54,29 +54,30 @@ namespace OCP { * Example: * Following function shows how to search for contacts for the name and the email address. * - * public static function getMatchingRecipient($term) { - * // The API is not active -> nothing to do + * public static function getMatchingRecipient($term) { + * // The API is not active -> nothing to do * if (!\OCP\Contacts::isEnabled()) { - * return array(); + * return array(); * } * * $result = \OCP\Contacts::search($term, array('FN', 'EMAIL')); * $receivers = array(); * foreach ($result as $r) { - * $id = $r['id']; - * $fn = $r['FN']; - * $email = $r['EMAIL']; - * if (!is_array($email)) { - * $email = array($email); - * } + * $id = $r['id']; + * $fn = $r['FN']; + * $email = $r['EMAIL']; + * if (!is_array($email)) { + * $email = array($email); + * } * - * // loop through all email addresses of this contact - * foreach ($email as $e) { - * $displayName = $fn . " <$e>"; - * $receivers[] = array('id' => $id, - * 'label' => $displayName, - * 'value' => $displayName); - * } + * // loop through all email addresses of this contact + * foreach ($email as $e) { + * $displayName = $fn . " <$e>"; + * $receivers[] = array( + * 'id' => $id, + * 'label' => $displayName, + * 'value' => $displayName); + * } * } * * return $receivers; diff --git a/lib/public/util.php b/lib/public/util.php index 7b5b1abbded..9727cfda284 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -173,6 +173,42 @@ class Util { } /** + * @brief returns the server hostname + * @returns the server hostname + * + * Returns the server host name without an eventual port number + */ + public static function getServerHostName() { + $host_name = self::getServerHost(); + // strip away port number (if existing) + $colon_pos = strpos($host_name, ':'); + if ($colon_pos != FALSE) { + $host_name = substr($host_name, 0, $colon_pos); + } + return $host_name; + } + + /** + * @brief Returns the default email address + * @param $user_part the user part of the address + * @returns the default email address + * + * Assembles a default email address (using the server hostname + * and the given user part, and returns it + * Example: when given lostpassword-noreply as $user_part param, + * and is currently accessed via http(s)://example.com/, + * it would return 'lostpassword-noreply@example.com' + */ + public static function getDefaultEmailAddress($user_part) { + $host_name = self::getServerHostName(); + // handle localhost installations + if ($server_host === 'localhost') { + $server_host = "example.com"; + } + return $user_part.'@'.$host_name; + } + + /** * @brief Returns the server protocol * @returns the server protocol * diff --git a/lib/request.php b/lib/request.php index c975c84a711..99a77e1b59e 100755 --- a/lib/request.php +++ b/lib/request.php @@ -18,7 +18,7 @@ class OC_Request { if(OC::$CLI) { return 'localhost'; } - if(OC_Config::getValue('overwritehost', '')<>''){ + if(OC_Config::getValue('overwritehost', '')<>'') { return OC_Config::getValue('overwritehost'); } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { @@ -43,7 +43,7 @@ class OC_Request { * Returns the server protocol. It respects reverse proxy servers and load balancers */ public static function serverProtocol() { - if(OC_Config::getValue('overwriteprotocol', '')<>''){ + if(OC_Config::getValue('overwriteprotocol', '')<>'') { return OC_Config::getValue('overwriteprotocol'); } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { @@ -74,7 +74,7 @@ class OC_Request { switch($encoding) { case 'ISO-8859-1' : - $path_info = utf8_encode($path_info); + $path_info = utf8_encode($path_info); } // end copy diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 1a0570a270d..4173e008ba7 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -97,13 +97,13 @@ class OC_TemplateLayout extends OC_Template { * @param $web base for path * @param $file the filename */ - static public function appendIfExist(&$files, $root, $webroot, $file) { - if (is_file($root.'/'.$file)) { + static public function appendIfExist(&$files, $root, $webroot, $file) { + if (is_file($root.'/'.$file)) { $files[] = array($root, $webroot, $file); return true; - } - return false; - } + } + return false; + } static public function findStylesheetFiles($styles) { // Read the selected theme from the config file @@ -130,8 +130,14 @@ class OC_TemplateLayout extends OC_Template { // or in apps? foreach( OC::$APPSROOTS as $apps_dir) { - if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) { $append =true; break; } - elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { $append =true; break; } + if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) { + $append = true; + break; + } + elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { + $append = true; + break; + } } if(! $append) { echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); @@ -192,8 +198,14 @@ class OC_TemplateLayout extends OC_Template { // Is it part of an app? $append = false; foreach( OC::$APPSROOTS as $apps_dir) { - if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { $append =true; break; } - elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { $append =true; break; } + if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { + $append = true; + break; + } + elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { + $append = true; + break; + } } if(! $append) { echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); diff --git a/lib/updater.php b/lib/updater.php index 11081eded63..d44ac108380 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -52,18 +52,18 @@ class OC_Updater{ ) ); $xml=@file_get_contents($url, 0, $ctx); - if($xml==false) { - return array(); - } - $data=@simplexml_load_string($xml); + if($xml==false) { + return array(); + } + $data=@simplexml_load_string($xml); $tmp=array(); - $tmp['version'] = $data->version; - $tmp['versionstring'] = $data->versionstring; - $tmp['url'] = $data->url; - $tmp['web'] = $data->web; + $tmp['version'] = $data->version; + $tmp['versionstring'] = $data->versionstring; + $tmp['url'] = $data->url; + $tmp['web'] = $data->web; - return $tmp; + return $tmp; } public static function ShowUpdatingHint() { diff --git a/lib/util.php b/lib/util.php index f2044625b41..4170de2125a 100755 --- a/lib/util.php +++ b/lib/util.php @@ -166,7 +166,7 @@ class OC_Util { * @param int timestamp $timestamp * @param bool dateOnly option to ommit time from the result */ - public static function formatDate( $timestamp, $dateOnly=false) { + public static function formatDate( $timestamp, $dateOnly=false) { if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it $systemTimeZone = intval(date('O')); $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100); @@ -176,37 +176,8 @@ class OC_Util { } $l=OC_L10N::get('lib'); return $l->l($dateOnly ? 'date' : 'datetime', $timestamp); - } - - /** - * Shows a pagenavi widget where you can jump to different pages. - * - * @param int $pagecount - * @param int $page - * @param string $url - * @return OC_Template - */ - public static function getPageNavi($pagecount, $page, $url) { - - $pagelinkcount=8; - if ($pagecount>1) { - $pagestart=$page-$pagelinkcount; - if($pagestart<0) $pagestart=0; - $pagestop=$page+$pagelinkcount; - if($pagestop>$pagecount) $pagestop=$pagecount; - - $tmpl = new OC_Template( '', 'part.pagenavi', '' ); - $tmpl->assign('page', $page); - $tmpl->assign('pagecount', $pagecount); - $tmpl->assign('pagestart', $pagestart); - $tmpl->assign('pagestop', $pagestop); - $tmpl->assign('url', $url); - return $tmpl; - } } - - /** * check if the current server configuration is suitable for ownCloud * @return array arrays with error messages and hints @@ -331,8 +302,7 @@ class OC_Util { $parameters[$value] = true; } if (!empty($_POST['user'])) { - $parameters["username"] = - OC_Util::sanitizeHTML($_POST['user']).'"'; + $parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"'; $parameters['user_autofocus'] = false; } else { $parameters["username"] = ''; @@ -584,9 +554,21 @@ class OC_Util { /** + * Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server. + */ + public static function issetlocaleworking() { + $result=setlocale(LC_ALL, 'en_US.UTF-8'); + if($result==false) { + return(false); + }else{ + return(true); + } + } + + /** * Check if the ownCloud server can connect to the internet */ - public static function isinternetconnectionworking() { + public static function isinternetconnectionworking() { // try to connect to owncloud.org to see if http connections to the internet are possible. $connected = @fsockopen("www.owncloud.org", 80); @@ -717,8 +699,7 @@ class OC_Util { $data=@file_get_contents($url, 0, $ctx); } - return $data; - } + } } diff --git a/settings/admin.php b/settings/admin.php index 0cf449ef2ba..04905391138 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -30,6 +30,7 @@ $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking()); +$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index f82ece4aee1..83d455550ae 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -7,7 +7,7 @@ $success = true; $username = $_POST["username"]; $group = $_POST["group"]; -if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')){ +if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group')))); exit(); diff --git a/settings/css/settings.css b/settings/css/settings.css index 560862fa12f..36457481911 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -68,3 +68,6 @@ span.securitywarning {color:#C33; font-weight:bold; } span.connectionwarning {color:#933; font-weight:bold; } input[type=radio] { width:1em; } table.shareAPI td { padding-bottom: 0.8em; } + +/* HELP */ +.pressed {background-color:#DDD;} diff --git a/settings/help.php b/settings/help.php index 69a5ec9c146..cd3d615425c 100644 --- a/settings/help.php +++ b/settings/help.php @@ -12,15 +12,25 @@ OC_App::loadApps(); OC_Util::addStyle( "settings", "settings" ); OC_App::setActiveNavigationEntry( "help" ); -$pagesize=7; -if(isset($_GET['page'])) $page=$_GET['page']; else $page=0; -$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize); -$totalitems=$kbe['totalitems']; -unset($kbe['totalitems']); -$pagecount=ceil($totalitems/$pagesize); + +if(isset($_GET['mode']) and $_GET['mode']=='admin') { + $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' ); + $style1=''; + $style2=' pressed'; +}else{ + $url=OC_Helper::linkToAbsolute( 'core', 'doc/user' ); + $style1=' pressed'; + $style2=''; +} + +$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user'; +$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin'; $tmpl = new OC_Template( "settings", "help", "user" ); -$tmpl->assign( "kbe", $kbe ); -$tmpl->assign( "pagecount", $pagecount ); -$tmpl->assign( "page", $page ); +$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') ); +$tmpl->assign( "url", $url ); +$tmpl->assign( "url1", $url1 ); +$tmpl->assign( "url2", $url2 ); +$tmpl->assign( "style1", $style1 ); +$tmpl->assign( "style2", $style2 ); $tmpl->printPage(); diff --git a/settings/js/users.js b/settings/js/users.js index f2ce69cf311..f148a43a480 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -64,7 +64,7 @@ var UserList={ } } }); - } + } }, add:function(username, groups, subadmin, quota, sort) { diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php index 8594825fdd6..98465cbf1c7 100644 --- a/settings/l10n/mk.php +++ b/settings/l10n/mk.php @@ -1,24 +1,38 @@ <?php $TRANSLATIONS = array( +"Unable to load list from App Store" => "Неможам да вчитам листа од App Store", +"Group already exists" => "Групата веќе постои", +"Unable to add group" => "Неможе да додадам група", +"Could not enable app. " => "Неможе да овозможам апликација.", "Email saved" => "Електронската пошта е снимена", "Invalid email" => "Неисправна електронска пошта", "OpenID Changed" => "OpenID сменето", "Invalid request" => "неправилно барање", +"Unable to delete group" => "Неможе да избришам група", +"Authentication error" => "Грешка во автентикација", +"Unable to delete user" => "Неможам да избришам корисник", "Language changed" => "Јазикот е сменет", +"Admins can't remove themself from the admin group" => "Администраторите неможе да се избришат себеси од админ групата", +"Unable to add user to group %s" => "Неможе да додадам корисник во група %s", +"Unable to remove user from group %s" => "Неможе да избришам корисник од група %s", "Disable" => "Оневозможи", "Enable" => "Овозможи", "Saving..." => "Снимам...", "__language_name__" => "__language_name__", "Add your App" => "Додадете ја Вашата апликација", +"More Apps" => "Повеќе аппликации", "Select an App" => "Избери аппликација", "See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com", +"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>", "Documentation" => "Документација", "Managing Big Files" => "Управување со големи датотеки", "Ask a question" => "Постави прашање", "Problems connecting to help database." => "Проблем при поврзување со базата за помош", "Go there manually." => "Оди таму рачно.", "Answer" => "Одговор", +"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>", "Desktop and Mobile Syncing Clients" => "Десктоп и мобилник клиенти за синхронизирање", "Download" => "Преземање", +"Your password was changed" => "Вашата лозинка беше променета.", "Unable to change your password" => "Вашата лозинка неможе да се смени", "Current password" => "Моментална лозинка", "New password" => "Нова лозинка", @@ -30,12 +44,14 @@ "Language" => "Јазик", "Help translate" => "Помогни во преводот", "use this address to connect to your ownCloud in your file manager" => "користете ја оваа адреса во менаџерот за датотеки да се поврзете со Вашиот ownCloud", +"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "Name" => "Име", "Password" => "Лозинка", "Groups" => "Групи", "Create" => "Создај", "Default Quota" => "Предефинирана квота", "Other" => "Останато", +"Group Admin" => "Администратор на група", "Quota" => "Квота", "Delete" => "Избриши" ); diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php index 83eb603ba3d..209d0b00847 100644 --- a/settings/l10n/ru_RU.php +++ b/settings/l10n/ru_RU.php @@ -11,6 +11,7 @@ "Authentication error" => "Ошибка авторизации", "Unable to delete user" => "Невозможно удалить пользователя", "Language changed" => "Язык изменен", +"Admins can't remove themself from the admin group" => "Администраторы не могут удалить сами себя из группы администраторов", "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s", "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s", "Disable" => "Отключить", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 9c4ee0bf680..a8e3375ab24 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -8,6 +8,7 @@ $levels=array('Debug','Info','Warning','Error', 'Fatal'); <?php +// is htaccess working ? if(!$_['htaccessworking']) { ?> <fieldset class="personalblock"> @@ -20,9 +21,22 @@ if(!$_['htaccessworking']) { </fieldset> <?php } + +// is locale working ? +if(!$_['islocaleworking']) { ?> +<fieldset class="personalblock"> + <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 caracters in file names. We strongly suggest to install the requirend packages on your system to support en_US.UTF-8.'); ?> + </span> +</fieldset> <?php +} + +// is internet connection working ? if(!$_['internetconnectionworking']) { ?> <fieldset class="personalblock"> @@ -100,7 +114,7 @@ if(!$_['internetconnectionworking']) { <fieldset class="personalblock"> <legend><strong><?php echo $l->t('Log');?></strong></legend> - Log level: <select name='loglevel' id='loglevel'> + <?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']):?> @@ -133,8 +147,9 @@ if(!$_['internetconnectionworking']) { </fieldset> -<p class="personalblock"> +<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>.'); ?> -</p> +</fieldset> diff --git a/settings/templates/help.php b/settings/templates/help.php index 75201a86a9f..b697905f7ef 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,34 +1,35 @@ -<?php -/** - * 2012 Frank Karlitschek frank@owncloud.org - * This file is licensed under the Affero General Public License version 3 or later. - * See the COPYING-README file. - */?> - <div id="controls"> - <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Documentation' ); ?></a> - <a class="button newquestion" href="http://owncloud.org/support/big-files" target="_blank"><?php echo $l->t( 'Managing Big Files' ); ?></a> - <a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a> - <?php - $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; - $pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url); - if($pageNavi) { - $pageNavi->printPage(); - } - ?> -</diV> -<?php if(!is_array($_["kbe"]) || !count($_["kbe"])):?> - <div class="helpblock"> - <p><?php echo $l->t('Problems connecting to help database.');?></p> - <p><a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a></p> - </div> -<?php else:?> - <?php foreach($_["kbe"] as $kb): ?> - <div class="helpblock"> - <?php if($kb["preview1"] <> "") echo('<img class="preview" src="'.$kb["preview1"].'" />'); ?> - <?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?> - <p><?php echo $kb['description'];?></p> - <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?> - </div> - <?php endforeach; -endif?> + <?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> + <?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="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> +</div> +<br /><br /> +<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe> + + +<script language="JavaScript"> +<!-- + +function pageY(elem) { + 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'; +} + +document.getElementById('ifm').onload=resizeIframe; +window.onresize = resizeIframe; + +//--> +</script> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d02bcdd7ea5..35eb0ef5e9a 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -8,26 +8,29 @@ <p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p> </div></div> -<div class="personalblock"> - <?php echo $l->t('Desktop and Mobile Syncing Clients');?> - <a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download');?></a> -</div> +<fieldset class="personalblock"> + <legend><strong><?php echo $l->t('Clients');?></strong></legend> + <a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a> + <a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a> + <a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a> +</fieldset> <form id="passwordform"> <fieldset class="personalblock"> + <legend><strong><?php echo $l->t('Password');?></strong></legend> <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div> <div id="passworderror"><?php echo $l->t('Unable to change your password');?></div> <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" /> <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" /> - <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label> + <input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label> <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> </fieldset> </form> <form id="lostpassword"> <fieldset class="personalblock"> - <label for="email"><strong><?php echo $l->t('Email');?></strong></label> + <legend><strong><?php echo $l->t('Email');?></strong></legend> <input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br /> <em><?php echo $l->t('Fill in an email address to enable password recovery');?></em> </fieldset> @@ -35,7 +38,7 @@ <form> <fieldset class="personalblock"> - <label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label> + <legend><strong><?php echo $l->t('Language');?></strong></legend> <select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>"> <?php foreach($_['languages'] as $language):?> <option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option> @@ -45,20 +48,21 @@ </fieldset> </form> -<p class="personalblock"> - <strong>WebDAV</strong> +<fieldset class="personalblock"> + <legend><strong><?php echo $l->t('WebDAV');?></strong></legend> <code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br /> - <em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em> -</p> + <em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em> +</fieldset> <?php foreach($_['forms'] as $form) { echo $form; };?> -<p class="personalblock"> +<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>.'); ?> -</p> +</fieldset> diff --git a/settings/templates/settings.php b/settings/templates/settings.php index 12368a1cdb6..de8092eeaff 100644 --- a/settings/templates/settings.php +++ b/settings/templates/settings.php @@ -6,4 +6,4 @@ <?php foreach($_['forms'] as $form) { echo $form; -};?>
\ No newline at end of file +}; |