diff options
115 files changed, 1159 insertions, 801 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index ac10191618b..9f38263bef3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -135,7 +135,7 @@ var Files = { return; } if (initStatus === '1') { // encryption tried to init but failed - OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); + OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); return; } if (encryptedFiles === '1') { diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php index 93ae47b25c5..c0b32e8e0cb 100644 --- a/apps/files/l10n/ast.php +++ b/apps/files/l10n/ast.php @@ -22,6 +22,7 @@ $TRANSLATIONS = array( "Upload" => "Xubir", "Save" => "Guardar", "New folder" => "Nueva carpeta", +"Folder" => "Carpeta", "Cancel upload" => "Encaboxar xuba", "Download" => "Descargar", "Delete" => "Desaniciar" diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 713072d3e0e..cf2022c2d7f 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -69,7 +69,7 @@ $TRANSLATIONS = array( "Maximum upload size" => "Μέγιστο μέγεθος αποστολής", "max. possible: " => "μέγιστο δυνατό:", "Needed for multi-file and folder downloads." => "Απαραίτητο για κατέβασμα πολλαπλών αρχείων και φακέλων", -"Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP", +"Enable ZIP-download" => "Επιτρέπεται η λήψη ZIP", "0 is unlimited" => "0 για απεριόριστο", "Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP", "Save" => "Αποθήκευση", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 76fafc32650..1f69dca628d 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -1,6 +1,6 @@ <?php $TRANSLATIONS = array( -"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.", +"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut", "Could not move %s" => "%s taşınamadı", "File name cannot be empty." => "Dosya adı boş olamaz.", "\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.", diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index f9515d67157..2e3741cbdca 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -11,7 +11,7 @@ class Helper $l = new \OC_L10N('files'); $maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); $maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize); - $maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize; + $maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize)); return array('uploadMaxFilesize' => $maxUploadFilesize, 'maxHumanFilesize' => $maxHumanFilesize, diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 95edd625cb3..a8437835d95 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -19,7 +19,7 @@ </div> <?php endif;?> <div id="upload" class="button" - title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>"> + title="<?php p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) ?>"> <?php if($_['uploadMaxFilesize'] >= 0):?> <input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php p($_['uploadMaxFilesize']) ?>"> <?php endif;?> diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php index 6a4e09aa3ab..90d64529b1c 100644 --- a/apps/files_external/l10n/cs_CZ.php +++ b/apps/files_external/l10n/cs_CZ.php @@ -6,12 +6,19 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.", "Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive", "Saved" => "Uloženo", +"<b>Note:</b> " => "<b>Poznámka:</b>", +" and " => "a", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.", "External Storage" => "Externí úložiště", "Folder name" => "Název složky", "External storage" => "Externí úložiště", "Configuration" => "Nastavení", "Options" => "Možnosti", +"Available for" => "Dostupné pro", "Add storage" => "Přidat úložiště", +"No user or group" => "Žádný uživatel nebo skupina.", "All Users" => "Všichni uživatelé", "Groups" => "Skupiny", "Users" => "Uživatelé", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index bb34494a5d7..baab272d1d2 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox", "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive", "Saved" => "Shranjeno", +"<b>Note:</b> " => "<b>Opomba:</b> ", +" and " => "in", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.", "External Storage" => "Zunanja podatkovna shramba", "Folder name" => "Ime mape", "External storage" => "Zunanja shramba", diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index d36683d42cd..efd8d4950d8 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -99,4 +99,5 @@ thead { .directLink input { margin-left: 5px; width: 300px; + max-width: 90%; } diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 5cd49e19aaa..f7724d07d2b 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -30,7 +30,7 @@ $(document).ready(function() { function removeCallback(result) { if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } var files = result.data.success; @@ -59,7 +59,7 @@ $(document).ready(function() { }, removeCallback ); - }); + }, t('files_trashbin', 'Restore')); }; FileActions.register('all', 'Delete', OC.PERMISSION_READ, function() { @@ -121,7 +121,7 @@ $(document).ready(function() { function(result) { if (allFiles) { if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } FileList.hideMask(); // simply remove all files @@ -170,7 +170,7 @@ $(document).ready(function() { function(result) { if (allFiles) { if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } FileList.hideMask(); // simply remove all files diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php index 91c122bd4d3..688e1ce3d8f 100644 --- a/apps/files_trashbin/l10n/ast.php +++ b/apps/files_trashbin/l10n/ast.php @@ -1,8 +1,13 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "Nun pudo desaniciase %s dafechu", +"Couldn't restore %s" => "Nun pudo restaurase %s", "Error" => "Fallu", +"Deleted Files" => "Ficheros desaniciaos", +"Nothing in here. Your trash bin is empty!" => "Nun hai un res equí. La papelera ta balera!", "Name" => "Nome", "Restore" => "Restaurar", +"Deleted" => "Desaniciáu", "Delete" => "Desaniciar" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_versions/l10n/ast.php b/apps/files_versions/l10n/ast.php index 4869d70b54d..31e6e72b2d7 100644 --- a/apps/files_versions/l10n/ast.php +++ b/apps/files_versions/l10n/ast.php @@ -1,6 +1,8 @@ <?php $TRANSLATIONS = array( +"Could not revert: %s" => "Nun pudo revertise: %s", "Versions" => "Versiones", +"Failed to revert {file} to revision {timestamp}." => "Fallu al revertir {file} a la revisión {timestamp}.", "More versions..." => "Más versiones...", "No other versions available" => "Nun hai otres versiones disponibles", "Restore" => "Restaurar" diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 40d9dec1410..3b5f377e108 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -88,6 +88,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { return $isInGroup; } + /** + * @param string $dnGroup + * @param array|null &$seen + */ private function _groupMembers($dnGroup, &$seen = null) { if ($seen === null) { $seen = array(); @@ -163,6 +167,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { return $groups; } + /** + * @param string $dn + * @param array|null &$seen + */ private function getGroupsByMember($dn, &$seen = null) { if ($seen === null) { $seen = array(); @@ -454,6 +462,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { return $allGroups; } + /** + * @param string $group + */ public function groupMatchesFilter($group) { return (strripos($group, $this->groupSearch) !== false); } diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php index 2c022880019..032de8aedbc 100644 --- a/apps/user_ldap/l10n/ast.php +++ b/apps/user_ldap/l10n/ast.php @@ -1,11 +1,41 @@ <?php $TRANSLATIONS = array( +"The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.", +"No action specified" => "Nun s'especificó l'aición", +"No configuration specified" => "Nun s'especificó la configuración", +"No data specified" => "Nun s'especificaron los datos", +" Could not set configuration %s" => "Nun pudo afitase la configuración %s", "Deletion failed" => "Falló'l borráu", +"Keep settings?" => "¿Caltener los axustes?", +"Cannot add server configuration" => "Nun pue amestase la configuración del sirvidor", +"Success" => "Con ésitu", "Error" => "Fallu", -"_%s group found_::_%s groups found_" => array("",""), -"_%s user found_::_%s users found_" => array("",""), +"Configuration incorrect" => "Configuración incorreuta", +"Configuration incomplete" => "Configuración incompleta", +"Select groups" => "Esbillar grupos", +"Select attributes" => "Esbillar atributos", +"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"), +"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"), +"Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada", "Save" => "Guardar", +"groups found" => "grupos alcontraos", +"Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:", +"LDAP Username:" => "Nome d'usuariu LDAP", +"Other Attributes:" => "Otros atributos:", +"Add Server Configuration" => "Amestar configuración del sirvidor", +"Host" => "Equipu", +"Port" => "Puertu", "Password" => "Contraseña", -"Continue" => "Continuar" +"For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.", +"users found" => "usuarios alcontraos", +"Continue" => "Continuar", +"Connection Settings" => "Axustes de conexón", +"Configuration Active" => "Configuración activa", +"When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.", +"Disable Main Server" => "Deshabilitar sirvidor principal", +"Turn off SSL certificate validation." => "Apagar la validación del certificáu SSL.", +"Directory Settings" => "Axustes del direutoriu", +"in bytes" => "en bytes", +"Internal Username" => "Nome d'usuariu internu" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 0b3ff4aa15e..8d622dcb794 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -948,8 +948,8 @@ class Access extends LDAPUtility { /** * @brief escapes (user provided) parts for LDAP filter - * @param String $input, the provided value - * @returns the escaped string + * @param string $input, the provided value + * @return the escaped string */ public function escapeFilterPart($input) { $search = array('*', '\\', '(', ')'); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 08ac4ac626b..173c4ebcc23 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -134,6 +134,9 @@ class Connection extends LDAPUtility { return $this->ldapConnectionRes; } + /** + * @param string|null $key + */ private function getCacheKey($key) { $prefix = 'LDAP-'.$this->configID.'-'.$this->configPrefix.'-'; if(is_null($key)) { diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index b27233bcd19..0eb294eb7a0 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -80,6 +80,9 @@ abstract class Proxy { return $result; } + /** + * @param string|null $key + */ private function getCacheKey($key) { $prefix = 'LDAP-Proxy-'; if(is_null($key)) { diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 3854af617c1..8ddee8c760c 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -485,7 +485,7 @@ class Wizard extends LDAPUtility { /** * @brief sets the found value for the configuration key in the WizardResult * as well as in the Configuration instance - * @param $key the configuration key + * @param string $key the configuration key * @param $value the (detected) value * @return null * @@ -1000,7 +1000,7 @@ class Wizard extends LDAPUtility { /** * @brief appends a list of values fr * @param $result resource, the return value from ldap_get_attributes - * @param $attribute string, the attribute values to look for + * @param string $attribute the attribute values to look for * @param &$known array, new values will be appended here * @return int, state on of the class constants LRESULT_PROCESSED_OK, * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP diff --git a/apps/user_ldap/lib/wizardresult.php b/apps/user_ldap/lib/wizardresult.php index 542f106cad8..9e0936faa69 100644 --- a/apps/user_ldap/lib/wizardresult.php +++ b/apps/user_ldap/lib/wizardresult.php @@ -36,6 +36,10 @@ class WizardResult { $this->markedChange = true; } + /** + * @param string $key + * @param array|string $values + */ public function addOptions($key, $values) { if(!is_array($values)) { $values = array($values); diff --git a/core/css/mobile.css b/core/css/mobile.css index 079fd2c017c..fd0628d7e28 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -7,6 +7,11 @@ background-position: right 26px; padding-right: 16px !important; } +/* do not show menu toggle on public share links as there is no menu */ +#body-public #owncloud.menutoggle { + background-image: none; + padding-right: 0 !important; +} /* compress search box on mobile, expand when focused */ .searchbox input[type="search"] { diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 536b180bc8f..70f4a2a9aa8 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -20,16 +20,16 @@ */ /** - * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events) + * Wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events) * includes a fallback for older browsers and IE * - * use server side events with causion, to many open requests can hang the server + * Use server side events with caution, too many open requests can hang the server */ /** - * create a new event source - * @param string src - * @param object data to be send as GET + * Create a new event source + * @param {string} src + * @param {object} [data] to be send as GET */ OC.EventSource=function(src,data){ var dataStr=''; @@ -74,12 +74,12 @@ OC.EventSource=function(src,data){ this.close(); } }.bind(this)); -} +}; OC.EventSource.fallBackSources=[]; OC.EventSource.iframeCount=0;//number of fallback iframes OC.EventSource.fallBackCallBack=function(id,type,data){ OC.EventSource.fallBackSources[id].fallBackCallBack(type,data); -} +}; OC.EventSource.prototype={ typelessListeners:[], iframe:null, @@ -127,4 +127,4 @@ OC.EventSource.prototype={ this.source.close(); } } -} +}; diff --git a/core/js/js.js b/core/js/js.js index f10c7163092..517c39f6f87 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -84,11 +84,11 @@ function initL10N(app) { } /** * translate a string - * @param app the id of the app for which to translate the string - * @param text the string to translate - * @param vars (optional) FIXME - * @param count (optional) number to replace %n with - * @return string + * @param {string} app the id of the app for which to translate the string + * @param {string} text the string to translate + * @param [vars] FIXME + * @param {number} [count] number to replace %n with + * @return {string} */ function t(app, text, vars, count){ initL10N(app); @@ -119,12 +119,12 @@ t.plural_function = {}; /** * translate a string - * @param app the id of the app for which to translate the string - * @param text_singular the string to translate for exactly one object - * @param text_plural the string to translate for n objects - * @param count number to determine whether to use singular or plural - * @param vars (optional) FIXME - * @return string + * @param {string} app the id of the app for which to translate the string + * @param {string} text_singular the string to translate for exactly one object + * @param {string} text_plural the string to translate for n objects + * @param {number} count number to determine whether to use singular or plural + * @param [vars] FIXME + * @return {string} Translated string */ function n(app, text_singular, text_plural, count, vars) { initL10N(app); @@ -146,9 +146,9 @@ function n(app, text_singular, text_plural, count, vars) { } /** -* Sanitizes a HTML string -* @param s string -* @return Sanitized string +* Sanitizes a HTML string by replacing all potential dangerous characters with HTML entities +* @param {string} s String to sanitize +* @return {string} Sanitized string */ function escapeHTML(s) { return s.toString().split('&').join('&').split('<').join('<').split('"').join('"'); @@ -156,9 +156,9 @@ function escapeHTML(s) { /** * Get the path to download a file -* @param file The filename -* @param dir The directory the file is in - e.g. $('#dir').val() -* @return string +* @param {string} file The filename +* @param {string} dir The directory the file is in - e.g. $('#dir').val() +* @return {string} Path to download the file * @deprecated use Files.getDownloadURL() instead */ function fileDownloadPath(dir, file) { @@ -176,32 +176,40 @@ var OC={ appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false, currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false, coreApps:['', 'admin','log','search','settings','core','3rdparty'], + /** - * get an absolute url to a file in an appen - * @param app the id of the app the file belongs to - * @param file the file path relative to the app folder - * @return string + * Get an absolute url to a file in an app + * @param {string} app the id of the app the file belongs to + * @param {string} file the file path relative to the app folder + * @return {string} Absolute URL to a file */ linkTo:function(app,file){ return OC.filePath(app,'',file); }, + /** - * Creates an url for remote use - * @param string $service id - * @return string the url - * - * Returns a url to the given service. + * Creates a relative url for remote use + * @param {string} service id + * @return {string} the url */ linkToRemoteBase:function(service) { return OC.webroot + '/remote.php/' + service; }, /** + * @brief Creates an absolute url for remote use + * @param {string} service id + * @return {string} the url + */ + linkToRemote:function(service) { + return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service); + }, + + /** * Generates the absolute url for the given relative url, which can contain parameters. - * - * @returns {string} * @param {string} url * @param params + * @return {string} Absolute URL for the given relative URL */ generateUrl: function(url, params) { var _build = function (text, vars) { @@ -220,22 +228,11 @@ var OC={ }, /** - * @brief Creates an absolute url for remote use - * @param string $service id - * @param bool $add_slash - * @return string the url - * - * Returns a absolute url to the given service. - */ - linkToRemote:function(service) { - return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service); - }, - /** - * get the absolute url for a file in an app - * @param app the id of the app - * @param type the type of the file to link to (e.g. css,img,ajax.template) - * @param file the filename - * @return string + * Get the absolute url for a file in an app + * @param {string} app the id of the app + * @param {string} type the type of the file to link to (e.g. css,img,ajax.template) + * @param {string} file the filename + * @return {string} Absolute URL for a file in an app */ filePath:function(app,type,file){ var isCore=OC.coreApps.indexOf(app)!==-1, @@ -279,19 +276,22 @@ var OC={ } return link; }, + /** * Redirect to the target URL, can also be used for downloads. + * @param {string} targetURL URL to redirect to */ - redirect: function(targetUrl) { - window.location = targetUrl; + redirect: function(targetURL) { + window.location = targetURL; }, + /** * get the absolute path to an image file - * @param app the app id to which the image belongs - * @param file the name of the image file - * @return string - * - * if no extension is given for the image, it will automatically decide between .png and .svg based on what the browser supports + * if no extension is given for the image, it will automatically decide + * between .png and .svg based on what the browser supports + * @param {string} app the app id to which the image belongs + * @param {string} file the name of the image file + * @return {string} */ imagePath:function(app,file){ if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support @@ -299,13 +299,13 @@ var OC={ } return OC.filePath(app,'img',file); }, + /** - * load a script for the server and load it - * @param app the app id to which the script belongs - * @param script the filename of the script - * @param ready event handeler to be called when the script is loaded - * - * if the script is already loaded, the event handeler will be called directly + * Load a script for the server and load it. If the script is already loaded, + * the event handler will be called directly + * @param {string} app the app id to which the script belongs + * @param {string} script the filename of the script + * @param ready event handler to be called when the script is loaded */ addScript:function(app,script,ready){ var deferred, path=OC.filePath(app,'js',script+'.js'); @@ -324,9 +324,9 @@ var OC={ return OC.addScript.loaded[path]; }, /** - * load a css file and load it - * @param app the app id to which the css style belongs - * @param style the filename of the css file + * Loads a CSS file + * @param {string} app the app id to which the css style belongs + * @param {string} style the filename of the css file */ addStyle:function(app,style){ var path=OC.filePath(app,'css',style+'.css'); @@ -340,15 +340,24 @@ var OC={ } } }, + + /** + * @todo Write the documentation + */ basename: function(path) { return path.replace(/\\/g,'/').replace( /.*\//, '' ); }, + + /** + * @todo Write the documentation + */ dirname: function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); }, + /** - * do a search query and display the results - * @param query the search query + * Do a search query and display the results + * @param {string} query the search query */ search:function(query){ if(query){ @@ -365,9 +374,10 @@ var OC={ var date = new Date(1000*mtime); return date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes(); }, + /** * Parses a URL query string into a JS map - * @param queryString query string in the format param1=1234¶m2=abcde¶m3=xyz + * @param {string} queryString query string in the format param1=1234¶m2=abcde¶m3=xyz * @return map containing key/values matching the URL parameters */ parseQueryString:function(queryString){ @@ -387,7 +397,7 @@ var OC={ parts = queryString.replace(/\+/g, '%20').split('&'); for (var i = 0; i < parts.length; i++){ // split on first equal sign - var part = parts[i] + var part = parts[i]; pos = part.indexOf('='); if (pos >= 0) { components = [ @@ -421,7 +431,7 @@ var OC={ /** * Builds a URL query from a JS map. * @param params parameter map - * @return string containing a URL query (without question) mark + * @return {string} String containing a URL query (without question) mark */ buildQueryString: function(params) { var s = ''; @@ -447,11 +457,11 @@ var OC={ /** * Opens a popup with the setting for an app. - * @param appid String. The ID of the app e.g. 'calendar', 'contacts' or 'files'. - * @param loadJS boolean or String. If true 'js/settings.js' is loaded. If it's a string + * @param {string} appid The ID of the app e.g. 'calendar', 'contacts' or 'files'. + * @param {boolean|string} loadJS If true 'js/settings.js' is loaded. If it's a string * it will attempt to load a script by that name in the 'js' directory. - * @param cache boolean. If true the javascript file won't be forced refreshed. Defaults to true. - * @param scriptName String. The name of the PHP file to load. Defaults to 'settings.php' in + * @param {boolean} [cache] If true the javascript file won't be forced refreshed. Defaults to true. + * @param {string} [scriptName] The name of the PHP file to load. Defaults to 'settings.php' in * the root of the app directory hierarchy. */ appSettings:function(args) { @@ -505,7 +515,10 @@ var OC={ } }, - // for menu toggling + /** + * For menu toggling + * @todo Write documentation + */ registerMenu: function($toggle, $menuEl) { $menuEl.addClass('menu'); $toggle.addClass('menutoggle'); @@ -528,6 +541,9 @@ var OC={ }); }, + /** + * @todo Write documentation + */ unregisterMenu: function($toggle, $menuEl) { // close menu if opened if ($menuEl.is(OC._currentMenu)) { @@ -544,6 +560,7 @@ var OC={ * * This is makes it possible for unit tests to * stub matchMedia (which doesn't work in PhantomJS) + * @todo Write documentation */ _matchMedia: function(media) { if (window.matchMedia) { @@ -552,6 +569,7 @@ var OC={ return false; } }; + OC.search.customResults={}; OC.search.currentResult=-1; OC.search.lastQuery=''; @@ -559,13 +577,32 @@ OC.search.lastResults={}; OC.addStyle.loaded=[]; OC.addScript.loaded=[]; +/** + * @todo Write documentation + */ OC.msg={ + /** + * @param selector + * @todo Write documentation + */ startSaving:function(selector){ OC.msg.startAction(selector, t('core', 'Saving...')); }, + + /** + * @param selector + * @param data + * @todo Write documentation + */ finishedSaving:function(selector, data){ OC.msg.finishedAction(selector, data); }, + + /** + * @param selector + * @param {string} message Message to display + * @todo WRite documentation + */ startAction:function(selector, message){ $(selector) .html( message ) @@ -574,6 +611,12 @@ OC.msg={ .stop(true, true) .show(); }, + + /** + * @param selector + * @param data + * @todo Write documentation + */ finishedAction:function(selector, data){ if( data.status === "success" ){ $(selector).html( data.data.message ) @@ -587,12 +630,26 @@ OC.msg={ } }; +/** + * @todo Write documentation + */ OC.Notification={ queuedNotifications: [], getDefaultNotificationFunction: null, + + /** + * @param callback + * @todo Write documentation + */ setDefault: function(callback) { OC.Notification.getDefaultNotificationFunction = callback; }, + + /** + * Hides a notification + * @param callback + * @todo Write documentation + */ hide: function(callback) { $('#notification').fadeOut('400', function(){ if (OC.Notification.isHidden()) { @@ -610,34 +667,62 @@ OC.Notification={ } }); }, + + /** + * Shows a notification as HTML without being sanitized before. + * If you pass unsanitized user input this may lead to a XSS vulnerability. + * Consider using show() instead of showHTML() + * @param {string} html Message to display + */ showHtml: function(html) { - if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){ - $('#notification').html(html); - $('#notification').fadeIn().css("display","inline"); + var notification = $('#notification'); + if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){ + notification.html(html); + notification.fadeIn().css("display","inline"); }else{ OC.Notification.queuedNotifications.push(html); } }, + + /** + * Shows a sanitized notification + * @param {string} text Message to display + */ show: function(text) { - if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){ - $('#notification').text(text); - $('#notification').fadeIn().css("display","inline"); + var notification = $('#notification'); + if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){ + notification.text(text); + notification.fadeIn().css("display","inline"); }else{ OC.Notification.queuedNotifications.push($('<div/>').text(text).html()); } }, + + /** + * Returns whether a notification is hidden. + * @return {boolean} + */ isHidden: function() { return ($("#notification").text() === ''); } }; +/** + * @todo Write documentation + */ OC.Breadcrumb={ container:null, - show:function(dir, leafname, leaflink){ + /** + * @todo Write documentation + * @param dir + * @param leafName + * @param leafLink + */ + show:function(dir, leafName, leafLink){ if(!this.container){//default this.container=$('#controls'); } - this._show(this.container, dir, leafname, leaflink); + this._show(this.container, dir, leafName, leafLink); }, _show:function(container, dir, leafname, leaflink){ var self = this; @@ -678,6 +763,12 @@ OC.Breadcrumb={ this._push(container, leafname, leaflink); } }, + + /** + * @todo Write documentation + * @param {string} name + * @param {string} link + */ push:function(name, link){ if(!this.container){//default this.container=$('#controls'); @@ -702,6 +793,10 @@ OC.Breadcrumb={ } return crumb; }, + + /** + * @todo Write documentation + */ pop:function(){ if(!this.container){//default this.container=$('#controls'); @@ -709,6 +804,10 @@ OC.Breadcrumb={ this.container.find('div.crumb').last().remove(); this.container.find('div.crumb').last().addClass('last'); }, + + /** + * @todo Write documentation + */ clear:function(){ if(!this.container){//default this.container=$('#controls'); @@ -721,21 +820,47 @@ OC.Breadcrumb={ }; if(typeof localStorage !=='undefined' && localStorage !== null){ - //user and instance aware localstorage + /** + * User and instance aware localstorage + */ OC.localStorage={ namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_', + + /** + * Whether the storage contains items + * @param {string} name + * @return {boolean} + */ hasItem:function(name){ return OC.localStorage.getItem(name)!==null; }, + + /** + * Add an item to the storage + * @param {string} name + * @param {string} item + */ setItem:function(name,item){ return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item)); }, + + /** + * Removes an item from the storage + * @param {string} name + * @param {string} item + */ removeItem:function(name,item){ return localStorage.removeItem(OC.localStorage.namespace+name); }, + + /** + * Get an item from the storage + * @param {string} name + * @return {null|string} + */ getItem:function(name){ var item = localStorage.getItem(OC.localStorage.namespace+name); - if(item===null) { + if(item === null) { return null; } else if (typeof JSON === 'undefined') { //fallback to jquery for IE6/7/8 @@ -762,6 +887,7 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ /** * check if the browser support svg images + * @return {boolean} */ function SVGSupport() { return SVGSupport.checkMimeType.correct && !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', "svg").createSVGRect; @@ -793,15 +919,18 @@ SVGSupport.checkMimeType=function(){ }; SVGSupport.checkMimeType.correct=true; -// replace all svg images with png for browser compatibility -// @deprecated use OC.Util.replaceSVG instead +/** + * Replace all svg images with png for browser compatibility + * @param $el + * @deprecated use OC.Util.replaceSVG instead + */ function replaceSVG($el){ return OC.Util.replaceSVG($el); } /** - * prototypal inharitence functions - * + * prototypical inheritance functions + * @todo Write documentation * usage: * MySubObject=object(MyObject) */ @@ -813,6 +942,7 @@ function object(o) { /** * Fills height of window. (more precise than height: 100%;) + * @param selector */ function fillHeight(selector) { if (selector.length === 0) { @@ -828,6 +958,7 @@ function fillHeight(selector) { /** * Fills height and width of window. (more precise than height: 100%; or width: 100%;) + * @param selector */ function fillWindow(selector) { if (selector.length === 0) { @@ -1055,6 +1186,11 @@ $.fn.filterAttr = function(attr_name, attr_value) { return this.filter(function() { return $(this).attr(attr_name) === attr_value; }); }; +/** + * Returns a human readable file size + * @param {number} size Size in bytes + * @return {string} + */ function humanFileSize(size) { var humanList = ['B', 'kB', 'MB', 'GB', 'TB']; // Calculate Log with base 1024: size = 1024 ** order @@ -1072,6 +1208,11 @@ function humanFileSize(size) { return relativeSize + ' ' + readableFormat; } +/** + * Format an UNIX timestamp to a human understandable format + * @param {number} date UNIX timestamp + * @return {string} Human readable format + */ function formatDate(date){ if(typeof date=='number'){ date=new Date(date); @@ -1079,7 +1220,13 @@ function formatDate(date){ return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); } -// taken from http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery +// +/** + * Get the value of a URL parameter + * @link http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery + * @param {string} name URL parameter + * @return {string} + */ function getURLParameter(name) { return decodeURI( (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1] @@ -1087,33 +1234,34 @@ function getURLParameter(name) { } /** - * takes an absolute timestamp and return a string with a human-friendly relative date - * @param int a Unix timestamp + * Takes an absolute timestamp and return a string with a human-friendly relative date + * @param {number} timestamp A Unix timestamp */ function relative_modified_date(timestamp) { - var timediff = Math.round((new Date()).getTime() / 1000) - timestamp; - var diffminutes = Math.round(timediff/60); - var diffhours = Math.round(diffminutes/60); - var diffdays = Math.round(diffhours/24); - var diffmonths = Math.round(diffdays/31); - if(timediff < 60) { return t('core','seconds ago'); } - else if(timediff < 3600) { return n('core','%n minute ago', '%n minutes ago', diffminutes); } - else if(timediff < 86400) { return n('core', '%n hour ago', '%n hours ago', diffhours); } - else if(timediff < 86400) { return t('core','today'); } - else if(timediff < 172800) { return t('core','yesterday'); } - else if(timediff < 2678400) { return n('core', '%n day ago', '%n days ago', diffdays); } - else if(timediff < 5184000) { return t('core','last month'); } - else if(timediff < 31556926) { return n('core', '%n month ago', '%n months ago', diffmonths); } - //else if(timediff < 31556926) { return t('core','months ago'); } - else if(timediff < 63113852) { return t('core','last year'); } + var timeDiff = Math.round((new Date()).getTime() / 1000) - timestamp; + var diffMinutes = Math.round(timeDiff/60); + var diffHours = Math.round(diffMinutes/60); + var diffDays = Math.round(diffHours/24); + var diffMonths = Math.round(diffDays/31); + if(timeDiff < 60) { return t('core','seconds ago'); } + else if(timeDiff < 3600) { return n('core','%n minute ago', '%n minutes ago', diffMinutes); } + else if(timeDiff < 86400) { return n('core', '%n hour ago', '%n hours ago', diffHours); } + else if(timeDiff < 86400) { return t('core','today'); } + else if(timeDiff < 172800) { return t('core','yesterday'); } + else if(timeDiff < 2678400) { return n('core', '%n day ago', '%n days ago', diffDays); } + else if(timeDiff < 5184000) { return t('core','last month'); } + else if(timeDiff < 31556926) { return n('core', '%n month ago', '%n months ago', diffMonths); } + else if(timeDiff < 63113852) { return t('core','last year'); } else { return t('core','years ago'); } } +/** + * @todo Write documentation + */ OC.Util = { /** * Returns whether the browser supports SVG - * - * @return true if the browser supports SVG, false otherwise + * @return {boolean} true if the browser supports SVG, false otherwise */ // TODO: replace with original function hasSVGSupport: SVGSupport, @@ -1121,10 +1269,8 @@ OC.Util = { * If SVG is not supported, replaces the given icon's extension * from ".svg" to ".png". * If SVG is supported, return the image path as is. - * - * @param file image path with svg extension - * @return fixed image path with png extension if SVG is not - * supported + * @param {string} file image path with svg extension + * @return {string} fixed image path with png extension if SVG is not supported */ replaceSVGIcon: function(file) { if (!OC.Util.hasSVGSupport()) { @@ -1176,8 +1322,9 @@ OC.Util = { }; /** - * get a variable by name - * @param string name + * Get a variable by name + * @param {string} name + * @return {*} */ OC.get=function(name) { var namespaces = name.split("."); @@ -1194,9 +1341,9 @@ OC.get=function(name) { }; /** - * set a variable by name - * @param string name - * @param mixed value + * Set a variable by name + * @param {string} name + * @param {*} value */ OC.set=function(name, value) { var namespaces = name.split("."); @@ -1252,4 +1399,3 @@ jQuery.fn.selectRange = function(start, end) { jQuery.fn.exists = function(){ return this.length > 0; }; - diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js index 0d7f40c592a..02175a3d674 100644 --- a/core/js/oc-requesttoken.js +++ b/core/js/oc-requesttoken.js @@ -1,4 +1,3 @@ -$(document).on('ajaxSend',function(elm, xhr, s) { +$(document).on('ajaxSend',function(elm, xhr) { xhr.setRequestHeader('requesttoken', oc_requesttoken); -}); - +});
\ No newline at end of file diff --git a/core/js/tags.js b/core/js/tags.js index bc2b42bf5ff..32a930259a6 100644 --- a/core/js/tags.js +++ b/core/js/tags.js @@ -59,7 +59,8 @@ OC.Tags= { }); }, /** - * @param string type + * @param {string} type + * @param {string} tag * @return jQuery.Promise which resolves with an array of ids */ getIdsForTag:function(type, tag) { @@ -80,8 +81,8 @@ OC.Tags= { return defer.promise(); }, /** - * @param string type - * @return jQuery.Promise which resolves with an array of ids + * @param {string} type + * @return {*} jQuery.Promise which resolves with an array of ids */ getFavorites:function(type) { if(!type && !this.type) { @@ -101,8 +102,8 @@ OC.Tags= { return defer.promise(); }, /** - * @param string type - * @return jQuery.Promise which resolves with an array of id/name objects + * @param {string} type + * @return {*} jQuery.Promise which resolves with an array of id/name objects */ getTags:function(type) { if(!type && !this.type) { @@ -122,9 +123,10 @@ OC.Tags= { return defer.promise(); }, /** - * @param int id - * @param string type - * @return jQuery.Promise + * @param {number} id + * @param {string} tag + * @param {string} type + * @return {*} jQuery.Promise */ tagAs:function(id, tag, type) { if(!type && !this.type) { @@ -146,9 +148,10 @@ OC.Tags= { return defer.promise(); }, /** - * @param int id - * @param string type - * @return jQuery.Promise + * @param {number} id + * @param {string} tag + * @param {string} type + * @return {*} jQuery.Promise */ unTag:function(id, tag, type) { if(!type && !this.type) { @@ -170,9 +173,9 @@ OC.Tags= { return defer.promise(); }, /** - * @param int id - * @param string type - * @return jQuery.Promise + * @param {number} id + * @param {string} type + * @return {*} jQuery.Promise */ addToFavorites:function(id, type) { if(!type && !this.type) { @@ -194,9 +197,9 @@ OC.Tags= { return defer.promise(); }, /** - * @param int id - * @param string type - * @return jQuery.Promise + * @param {number} id + * @param {string} type + * @return {*} jQuery.Promise */ removeFromFavorites:function(id, type) { if(!type && !this.type) { @@ -218,9 +221,9 @@ OC.Tags= { return defer.promise(); }, /** - * @param string tag - * @param string type - * @return jQuery.Promise which resolves with an object with the name and the new id + * @param {string} tag + * @param {string} type + * @return {*} jQuery.Promise which resolves with an object with the name and the new id */ addTag:function(tag, type) { if(!type && !this.type) { @@ -245,9 +248,9 @@ OC.Tags= { return defer.promise(); }, /** - * @param array tags - * @param string type - * @return jQuery.Promise + * @param {array} tags + * @param {string} type + * @return {*} jQuery.Promise */ deleteTags:function(tags, type) { if(!type && !this.type) { diff --git a/core/l10n/ast.php b/core/l10n/ast.php index 0fcda328dc0..667e452a0de 100644 --- a/core/l10n/ast.php +++ b/core/l10n/ast.php @@ -22,6 +22,7 @@ $TRANSLATIONS = array( "November" => "Payares", "December" => "Avientu", "Settings" => "Axustes", +"Saving..." => "Guardando...", "seconds ago" => "fai segundos", "_%n minute ago_::_%n minutes ago_" => array("fai %n minutu","fai %n minutos"), "_%n hour ago_::_%n hours ago_" => array("fai %n hora","fai %n hores"), @@ -57,6 +58,7 @@ $TRANSLATIONS = array( "share" => "compartir", "Password protected" => "Contraseña protexida", "Email sent" => "Corréu unviáu", +"Warning" => "Avisu", "Delete" => "Desaniciar", "Add" => "Amestar", "Edit tags" => "Editar etiquetes", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index c21d904b233..45c92406bff 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"), "One file conflict" => "Jeden konflikt souboru", "New Files" => "Nové soubory", +"Already existing files" => "Soubory již existují", "Which files do you want to keep?" => "Které soubory chcete ponechat?", "If you select both versions, the copied file will have a number added to its name." => "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.", "Cancel" => "Zrušit", diff --git a/core/l10n/el.php b/core/l10n/el.php index c899427ae30..e6a53c54d3c 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -75,7 +75,7 @@ $TRANSLATIONS = array( "Share link" => "Διαμοιρασμός συνδέσμου", "Password protect" => "Προστασία συνθηματικού", "Password" => "Συνθηματικό", -"Allow Public Upload" => "Να επιτρέπεται η Δημόσια Αποστολή", +"Allow Public Upload" => "Επιτρέπεται η Δημόσια Αποστολή", "Email link to person" => "Αποστολή συνδέσμου με email ", "Send" => "Αποστολή", "Set expiration date" => "Ορισμός ημ. λήξης", @@ -85,7 +85,7 @@ $TRANSLATIONS = array( "group" => "ομάδα", "Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται", "Shared in {item} with {user}" => "Διαμοιρασμός του {item} με τον {user}", -"Unshare" => "Σταμάτημα διαμοιρασμού", +"Unshare" => "Διακοπή διαμοιρασμού", "notify by email" => "ειδοποίηση με email", "can edit" => "δυνατότητα αλλαγής", "access control" => "έλεγχος πρόσβασης", @@ -128,7 +128,7 @@ $TRANSLATIONS = array( "Personal" => "Προσωπικά", "Users" => "Χρήστες", "Apps" => "Εφαρμογές", -"Admin" => "Διαχειριστής", +"Admin" => "Διαχείριση", "Help" => "Βοήθεια", "Error loading tags" => "Σφάλμα φόρτωσης ετικετών", "Tag already exists" => "Υπάρχει ήδη η ετικέτα", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index eb9f1af5657..fac17a5c230 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -36,7 +36,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"), "today" => "hoxe", "yesterday" => "onte", -"_%n day ago_::_%n days ago_" => array("hai %n día","hai %n días"), +"_%n day ago_::_%n days ago_" => array("hai %n día","vai %n días"), "last month" => "último mes", "_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"), "months ago" => "meses atrás", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 7476d9f9c7c..7da6a81086c 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"), "One file conflict" => "En spor datotek", "New Files" => "Nove datoteke", +"Already existing files" => "Obstoječe datoteke", "Which files do you want to keep?" => "Katare datoteke želite ohraniti?", "If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.", "Cancel" => "Prekliči", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index d3002f87bff..2b0d952a34b 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -39,9 +39,9 @@ $TRANSLATIONS = array( "_%n day ago_::_%n days ago_" => array("%n gün önce","%n gün önce"), "last month" => "geçen ay", "_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"), -"months ago" => "ay önce", +"months ago" => "aylar önce", "last year" => "geçen yıl", -"years ago" => "yıl önce", +"years ago" => "yıllar önce", "Choose" => "Seç", "Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}", "Yes" => "Evet", @@ -69,19 +69,19 @@ $TRANSLATIONS = array( "Error" => "Hata", "Error while sharing" => "Paylaşım sırasında hata", "Error while unsharing" => "Paylaşım iptal edilirken hata", -"Error while changing permissions" => "İzinleri değiştirirken hata oluştu", +"Error while changing permissions" => "İzinleri değiştirirken hata", "Shared with you and the group {group} by {owner}" => "{owner} tarafından sizinle ve {group} ile paylaştırılmış", "Shared with you by {owner}" => "{owner} tarafından sizinle paylaşıldı", "Share with user or group …" => "Kullanıcı veya grup ile paylaş...", "Share link" => "Paylaşma bağlantısı", "Password protect" => "Parola koruması", "Password" => "Parola", -"Allow Public Upload" => "Genel Gönderime İzin Ver", +"Allow Public Upload" => "Herkes Tarafından Gönderime İzin Ver", "Email link to person" => "Bağlantıyı e-posta ile gönder", "Send" => "Gönder", "Set expiration date" => "Son kullanma tarihini ayarla", "Expiration date" => "Son kullanım tarihi", -"Share via email:" => "E-posta ile paylaş", +"Share via email:" => "E-posta ile paylaş:", "No people found" => "Kişi bulunamadı", "group" => "grup", "Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor", @@ -95,8 +95,8 @@ $TRANSLATIONS = array( "delete" => "sil", "share" => "paylaş", "Password protected" => "Parola korumalı", -"Error unsetting expiration date" => "Geçerlilik tarihi tanımlama kaldırma hatası", -"Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası", +"Error unsetting expiration date" => "Son kullanma tarihi kaldırma hatası", +"Error setting expiration date" => "Son kullanma tarihi ayarlama hatası", "Sending ..." => "Gönderiliyor...", "Email sent" => "E-posta gönderildi", "Warning" => "Uyarı", @@ -108,23 +108,23 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "İletişim şablonu yüklenirken hata: {error}", "No tags selected for deletion." => "Silmek için bir etiket seçilmedi.", "Please reload the page." => "Lütfen sayfayı yeniden yükleyin.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", -"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin.", +"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.", "%s password reset" => "%s parola sıfırlama", -"A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yönetinizle iletişime geçin.", +"A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin.", "Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}", -"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br> Eğer yine bulamazsanız sistem yöneticinize sorunuz.", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br>Eğer yine bulamazsanız sistem yöneticinize danışın.", "Request failed!<br>Did you make sure your email/username was right?" => "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru olduğundan emin misiniz?", -"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız.", +"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.", "Username" => "Kullanıcı Adı", -"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?", "Yes, I really want to reset my password now" => "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum", "Reset" => "Sıfırla", "Your password was reset" => "Parolanız sıfırlandı", "To login page" => "Giriş sayfasına git", "New password" => "Yeni parola", "Reset password" => "Parolayı sıfırla", -"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X desteklenmemediğinden %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!", +"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!", "For the best results, please consider using a GNU/Linux server instead." => "En iyi sonuçlar için GNU/Linux sunucusu kullanın.", "Personal" => "Kişisel", "Users" => "Kullanıcılar", @@ -135,25 +135,25 @@ $TRANSLATIONS = array( "Tag already exists" => "Etiket zaten mevcut", "Error deleting tag(s)" => "Etiket(ler) silinirken hata", "Error tagging" => "Etiketleme hatası", -"Error untagging" => "Etiket kaldırılırken hata", +"Error untagging" => "Etiket kaldırma hatası", "Error favoriting" => "Beğenilirken hata", "Error unfavoriting" => "Beğeniden kaldırılırken hata", -"Access forbidden" => "Erişim yasaklı", +"Access forbidden" => "Erişim yasak", "Cloud not found" => "Bulut bulunamadı", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n", "The share will expire on %s." => "Bu paylaşım %s tarihinde sona erecek.", -"Cheers!" => "Şerefe!", +"Cheers!" => "Hoşça kalın!", "Security Warning" => "Güvenlik Uyarısı", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rastgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rastgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.", "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun", "Storage & database" => "Depolama ve veritabanı", "Data folder" => "Veri klasörü", -"Configure the database" => "Veritabanını ayarla", +"Configure the database" => "Veritabanını yapılandır", "will be used" => "kullanılacak", "Database user" => "Veritabanı kullanıcı adı", "Database password" => "Veritabanı parolası", @@ -163,23 +163,23 @@ $TRANSLATIONS = array( "Finish setup" => "Kurulumu tamamla", "Finishing …" => "Tamamlanıyor ...", "This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve bu arayüzü yeniden yükleyin.", -"%s is available. Get more information on how to update." => "%s mevcut. Güncelleştirme hakkında daha fazla bilgi alın.", +"%s is available. Get more information on how to update." => "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.", "Log out" => "Çıkış yap", "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!", "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmediyseniz hesabınız tehlikede olabilir!", "Please change your password to secure your account again." => "Hesabınızı tekrar güvene almak için lütfen parolanızı değiştirin.", "Server side authentication failed!" => "Sunucu taraflı yetkilendirme başarısız!", -"Please contact your administrator." => "Lütfen sistem yöneticisi ile iletişime geçin.", +"Please contact your administrator." => "Lütfen sistem yöneticiniz ile iletişime geçin.", "Lost your password?" => "Parolanızı mı unuttunuz?", "remember" => "hatırla", "Log in" => "Giriş yap", "Alternative Logins" => "Alternatif Girişler", -"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Merhaba, <br><br> %s sizinle <strong>%s</strong> paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>", "This ownCloud instance is currently in single user mode." => "Bu ownCloud örneği şu anda tek kullanıcı kipinde.", "This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.", "Thank you for your patience." => "Sabrınız için teşekkür ederiz.", -"Updating ownCloud to version %s, this may take a while." => "Owncloud %s sürümüne güncelleniyor. Biraz zaman alabilir.", +"Updating ownCloud to version %s, this may take a while." => "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir.", "This ownCloud instance is currently being updated, which may take a while." => "Bu ownCloud örneği şu anda güncelleniyor, bu biraz zaman alabilir.", "Please reload this page after a short time to continue using ownCloud." => "ownCloud kullanmaya devam etmek için kısa bir süre sonra lütfen sayfayı yenileyin." ); diff --git a/core/setup/controller.php b/core/setup/controller.php index 1a8e9b2b764..cdbe0f7e129 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -122,7 +122,7 @@ class Controller { // Protect data directory here, so we can test if the protection is working \OC_Setup::protectDataDirectory(); try { - $htaccessWorking = \OC_Util::isHtAccessWorking(); + $htaccessWorking = \OC_Util::isHtaccessWorking(); } catch (\OC\HintException $e) { $errors[] = array( 'error' => $e->getMessage(), diff --git a/l10n/ast/core.po b/l10n/ast/core.po index ecfeb86a379..2a19c06bdcb 100644 --- a/l10n/ast/core.po +++ b/l10n/ast/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" "Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -141,7 +141,7 @@ msgstr "Axustes" #: js/js.js:564 msgid "Saving..." -msgstr "" +msgstr "Guardando..." #: js/js.js:1099 msgid "seconds ago" @@ -295,12 +295,12 @@ msgstr "Compartíu" msgid "Share" msgstr "Compartir" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Fallu" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "" @@ -364,73 +364,73 @@ msgstr "" msgid "No people found" msgstr "" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "grupu" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "Dexar de compartir" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "notificar per corréu" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "pue editar" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "control d'accesu" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "crear" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "xubir" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "desaniciar" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "compartir" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "Contraseña protexida" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "" -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "Corréu unviáu" -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" -msgstr "" +msgstr "Avisu" #: js/tags.js:4 msgid "The object type is not specified." diff --git a/l10n/ast/files.po b/l10n/ast/files.po index 260501f2889..89e4cae67dc 100644 --- a/l10n/ast/files.po +++ b/l10n/ast/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 17:44+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -359,7 +359,7 @@ msgstr "Nueva carpeta" #: templates/index.php:13 msgid "Folder" -msgstr "" +msgstr "Carpeta" #: templates/index.php:16 msgid "From link" diff --git a/l10n/ast/files_trashbin.po b/l10n/ast/files_trashbin.po index eb1ea8604aa..5e51f4759a0 100644 --- a/l10n/ast/files_trashbin.po +++ b/l10n/ast/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Iñigo Varela <ivarela@softastur.org>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" +"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,12 +21,12 @@ msgstr "" #: ajax/delete.php:59 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "Nun pudo desaniciase %s dafechu" #: ajax/undelete.php:64 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "Nun pudo restaurase %s" #: js/filelist.js:3 msgid "Deleted files" @@ -37,15 +38,15 @@ msgstr "Fallu" #: js/trash.js:264 msgid "Deleted Files" -msgstr "" +msgstr "Ficheros desaniciaos" -#: lib/trashbin.php:859 lib/trashbin.php:861 +#: lib/trashbin.php:861 lib/trashbin.php:863 msgid "restored" msgstr "" #: templates/index.php:6 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "Nun hai un res equí. La papelera ta balera!" #: templates/index.php:19 msgid "Name" @@ -57,7 +58,7 @@ msgstr "Restaurar" #: templates/index.php:30 msgid "Deleted" -msgstr "" +msgstr "Desaniciáu" #: templates/index.php:33 templates/index.php:34 msgid "Delete" diff --git a/l10n/ast/files_versions.po b/l10n/ast/files_versions.po index 2fdf419af52..7e36b74889b 100644 --- a/l10n/ast/files_versions.po +++ b/l10n/ast/files_versions.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Iñigo Varela <ivarela@softastur.org>, 2014 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 21:40+0000\n" -"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 14:21+0000\n" +"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: ajax/rollbackVersion.php:13 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "Nun pudo revertise: %s" #: js/versions.js:39 msgid "Versions" @@ -29,7 +30,7 @@ msgstr "Versiones" #: js/versions.js:61 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "Fallu al revertir {file} a la revisión {timestamp}." #: js/versions.js:88 msgid "More versions..." diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po index b8bc741fae3..800d6e3ec20 100644 --- a/l10n/ast/settings.po +++ b/l10n/ast/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 17:44+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -565,7 +565,7 @@ msgstr "" #: templates/admin.php:357 msgid "Port" -msgstr "" +msgstr "Puertu" #: templates/admin.php:362 msgid "Credentials" diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po index 3c4a00ce67c..9b6520840c6 100644 --- a/l10n/ast/user_ldap.po +++ b/l10n/ast/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 17:44+0000\n" +"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,24 +40,24 @@ msgstr "" msgid "" "The configuration is invalid. Please have a look at the logs for further " "details." -msgstr "" +msgstr "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles." #: ajax/wizard.php:32 msgid "No action specified" -msgstr "" +msgstr "Nun s'especificó l'aición" #: ajax/wizard.php:38 msgid "No configuration specified" -msgstr "" +msgstr "Nun s'especificó la configuración" #: ajax/wizard.php:81 msgid "No data specified" -msgstr "" +msgstr "Nun s'especificaron los datos" #: ajax/wizard.php:89 #, php-format msgid " Could not set configuration %s" -msgstr "" +msgstr "Nun pudo afitase la configuración %s" #: js/settings.js:67 msgid "Deletion failed" @@ -68,11 +69,11 @@ msgstr "" #: js/settings.js:84 msgid "Keep settings?" -msgstr "" +msgstr "¿Caltener los axustes?" #: js/settings.js:99 msgid "Cannot add server configuration" -msgstr "" +msgstr "Nun pue amestase la configuración del sirvidor" #: js/settings.js:127 msgid "mappings cleared" @@ -80,7 +81,7 @@ msgstr "" #: js/settings.js:128 msgid "Success" -msgstr "" +msgstr "Con ésitu" #: js/settings.js:133 msgid "Error" @@ -92,15 +93,15 @@ msgstr "" #: js/settings.js:847 msgid "Configuration incorrect" -msgstr "" +msgstr "Configuración incorreuta" #: js/settings.js:856 msgid "Configuration incomplete" -msgstr "" +msgstr "Configuración incompleta" #: js/settings.js:873 js/settings.js:882 msgid "Select groups" -msgstr "" +msgstr "Esbillar grupos" #: js/settings.js:876 js/settings.js:885 msgid "Select object classes" @@ -108,7 +109,7 @@ msgstr "" #: js/settings.js:879 msgid "Select attributes" -msgstr "" +msgstr "Esbillar atributos" #: js/settings.js:906 msgid "Connection test succeeded" @@ -130,15 +131,15 @@ msgstr "" #, php-format msgid "%s group found" msgid_plural "%s groups found" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s grupu alcontráu" +msgstr[1] "%s grupos alcontraos" #: lib/wizard.php:122 #, php-format msgid "%s user found" msgid_plural "%s users found" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s usuariu alcontráu" +msgstr[1] "%s usuarios alcontraos" #: lib/wizard.php:784 lib/wizard.php:796 msgid "Invalid Host" @@ -146,7 +147,7 @@ msgstr "" #: lib/wizard.php:983 msgid "Could not find the desired feature" -msgstr "" +msgstr "Nun pudo alcontrase la carauterística deseyada" #: templates/part.settingcontrols.php:2 msgid "Save" @@ -195,15 +196,15 @@ msgstr "" #: templates/part.wizard-groupfilter.php:38 msgid "groups found" -msgstr "" +msgstr "grupos alcontraos" #: templates/part.wizard-loginfilter.php:4 msgid "Users login with this attribute:" -msgstr "" +msgstr "Aniciu de sesión d'usuarios con esti atributu:" #: templates/part.wizard-loginfilter.php:8 msgid "LDAP Username:" -msgstr "" +msgstr "Nome d'usuariu LDAP" #: templates/part.wizard-loginfilter.php:16 msgid "LDAP Email Address:" @@ -211,7 +212,7 @@ msgstr "" #: templates/part.wizard-loginfilter.php:24 msgid "Other Attributes:" -msgstr "" +msgstr "Otros atributos:" #: templates/part.wizard-loginfilter.php:38 #, php-format @@ -222,11 +223,11 @@ msgstr "" #: templates/part.wizard-server.php:18 msgid "Add Server Configuration" -msgstr "" +msgstr "Amestar configuración del sirvidor" #: templates/part.wizard-server.php:30 msgid "Host" -msgstr "" +msgstr "Equipu" #: templates/part.wizard-server.php:31 msgid "" @@ -235,7 +236,7 @@ msgstr "" #: templates/part.wizard-server.php:36 msgid "Port" -msgstr "" +msgstr "Puertu" #: templates/part.wizard-server.php:44 msgid "User DN" @@ -254,7 +255,7 @@ msgstr "Contraseña" #: templates/part.wizard-server.php:53 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Pa un accesu anónimu, dexar el DN y la contraseña baleros." #: templates/part.wizard-server.php:60 msgid "One Base DN per line" @@ -277,7 +278,7 @@ msgstr "" #: templates/part.wizard-userfilter.php:38 msgid "users found" -msgstr "" +msgstr "usuarios alcontraos" #: templates/part.wizardcontrols.php:5 msgid "Back" @@ -302,15 +303,15 @@ msgstr "" #: templates/settings.php:20 msgid "Connection Settings" -msgstr "" +msgstr "Axustes de conexón" #: templates/settings.php:22 msgid "Configuration Active" -msgstr "" +msgstr "Configuración activa" #: templates/settings.php:22 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Cuando nun tea conseñáu, saltaráse esta configuración." #: templates/settings.php:23 msgid "Backup (Replica) Host" @@ -328,7 +329,7 @@ msgstr "" #: templates/settings.php:25 msgid "Disable Main Server" -msgstr "" +msgstr "Deshabilitar sirvidor principal" #: templates/settings.php:25 msgid "Only connect to the replica server." @@ -340,7 +341,7 @@ msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Apagar la validación del certificáu SSL." #: templates/settings.php:27 #, php-format @@ -359,7 +360,7 @@ msgstr "" #: templates/settings.php:30 msgid "Directory Settings" -msgstr "" +msgstr "Axustes del direutoriu" #: templates/settings.php:32 msgid "User Display Name Field" @@ -444,7 +445,7 @@ msgstr "" #: templates/settings.php:45 msgid "in bytes" -msgstr "" +msgstr "en bytes" #: templates/settings.php:46 msgid "Email Field" @@ -462,7 +463,7 @@ msgstr "" #: templates/settings.php:53 msgid "Internal Username" -msgstr "" +msgstr "Nome d'usuariu internu" #: templates/settings.php:54 msgid "" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index d39979f547b..d5e17f61366 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -7,6 +7,7 @@ # dibalaj <dibalaj@dibalaj.cz>, 2013 # Honza K. <honza889@gmail.com>, 2013 # liska_, 2013 +# svetlemodry <jaroslav@lichtblau.cz>, 2014 # Martin <fireball@atlas.cz>, 2013 # m23 <black23@gmail.com>, 2014 # pstast <petr@stastny.eu>, 2013-2014 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" -"Last-Translator: pstast <petr@stastny.eu>\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 17:44+0000\n" +"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -247,7 +248,7 @@ msgstr "Nové soubory" #: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Soubory již existují" #: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" @@ -307,12 +308,12 @@ msgstr "Sdílené" msgid "Share" msgstr "Sdílet" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Chyba" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "Chyba při sdílení" @@ -376,71 +377,71 @@ msgstr "Sdílet e-mailem:" msgid "No people found" msgstr "Žádní lidé nenalezeni" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "skupina" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "Sdílení již sdílené položky není povoleno" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "Sdíleno v {item} s {user}" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "Zrušit sdílení" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "upozornit e-mailem" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "lze upravovat" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "řízení přístupu" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "vytvořit" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "aktualizovat" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "smazat" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "sdílet" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "Chráněno heslem" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "Chyba při odstraňování data vypršení platnosti" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "Chyba při nastavení data vypršení platnosti" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "Odesílám ..." -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "E-mail odeslán" -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" msgstr "Varování" diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po index 05a39f7eb80..82abf9c3dfa 100644 --- a/l10n/cs_CZ/files_external.po +++ b/l10n/cs_CZ/files_external.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# svetlemodry <jaroslav@lichtblau.cz>, 2014 # m23 <black23@gmail.com>, 2014 # pstast <petr@stastny.eu>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 17:44+0000\n" +"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,34 +44,34 @@ msgstr "Chyba při nastavení úložiště Google Drive" msgid "Saved" msgstr "Uloženo" -#: lib/config.php:592 +#: lib/config.php:598 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>Poznámka:</b>" -#: lib/config.php:602 +#: lib/config.php:608 msgid " and " -msgstr "" +msgstr "a" -#: lib/config.php:624 +#: lib/config.php:630 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje." -#: lib/config.php:626 +#: lib/config.php:632 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje." -#: lib/config.php:628 +#: lib/config.php:634 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci." #: templates/settings.php:2 msgid "External Storage" @@ -94,7 +95,7 @@ msgstr "Možnosti" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "Dostupné pro" #: templates/settings.php:32 msgid "Add storage" @@ -102,7 +103,7 @@ msgstr "Přidat úložiště" #: templates/settings.php:92 msgid "No user or group" -msgstr "" +msgstr "Žádný uživatel nebo skupina." #: templates/settings.php:95 msgid "All Users" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index 18418dadda2..a6d2b528e15 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -5,6 +5,7 @@ # Translators: # Honza K. <honza889@gmail.com>, 2013 # liska_, 2013 +# svetlemodry <jaroslav@lichtblau.cz>, 2014 # m23 <black23@gmail.com>, 2014 # pstast <petr@stastny.eu>, 2013-2014 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-14 01:54-0400\n" -"PO-Revision-Date: 2014-04-14 04:55+0000\n" -"Last-Translator: pstast <petr@stastny.eu>\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 17:44+0000\n" +"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +54,7 @@ msgstr "Uživatelé" msgid "Admin" msgstr "Administrace" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Selhala aktualizace verze \"%s\"." @@ -78,7 +79,7 @@ msgstr "Stahování v ZIPu je vypnuto." msgid "Files need to be downloaded one by one." msgstr "Soubory musí být stahovány jednotlivě." -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "Zpět k souborům" @@ -152,15 +153,15 @@ msgstr "Nelze vytvořit složku aplikace. Opravte práva souborů. %s" msgid "Application is not enabled" msgstr "Aplikace není povolena" -#: private/json.php:40 private/json.php:63 private/json.php:88 +#: private/json.php:40 private/json.php:62 private/json.php:87 msgid "Authentication error" msgstr "Chyba ověření" -#: private/json.php:52 +#: private/json.php:51 msgid "Token expired. Please reload page." msgstr "Token vypršel. Obnovte prosím stránku." -#: private/json.php:75 +#: private/json.php:74 msgid "Unknown user" msgstr "Neznámý uživatel" @@ -346,20 +347,20 @@ msgstr "minulý rok" msgid "years ago" msgstr "před lety" -#: private/user/manager.php:246 +#: private/user/manager.php:232 msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" -#: private/user/manager.php:251 +#: private/user/manager.php:237 msgid "A valid username must be provided" msgstr "Musíte zadat platné uživatelské jméno" -#: private/user/manager.php:255 +#: private/user/manager.php:241 msgid "A valid password must be provided" msgstr "Musíte zadat platné heslo" -#: private/user/manager.php:260 +#: private/user/manager.php:246 msgid "The username is already being used" msgstr "Uživatelské jméno je již využíváno" diff --git a/l10n/el/core.po b/l10n/el/core.po index 2e4e99bc8f7..9b44871cb23 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -13,13 +13,14 @@ # Wasilis <inactive+Wasilis@transifex.com>, 2013 # Wasilis <inactive+Wasilis@transifex.com>, 2013 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013 +# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 22:00+0000\n" +"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -304,12 +305,12 @@ msgstr "Κοινόχρηστα" msgid "Share" msgstr "Διαμοιρασμός" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Σφάλμα" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "Σφάλμα κατά τον διαμοιρασμό" @@ -347,7 +348,7 @@ msgstr "Συνθηματικό" #: js/share.js:230 msgid "Allow Public Upload" -msgstr "Να επιτρέπεται η Δημόσια Αποστολή" +msgstr "Επιτρέπεται η Δημόσια Αποστολή" #: js/share.js:234 msgid "Email link to person" @@ -373,71 +374,71 @@ msgstr "Διαμοιρασμός μέσω email:" msgid "No people found" msgstr "Δεν βρέθηκε άνθρωπος" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "ομάδα" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "Ξαναμοιρασμός δεν επιτρέπεται" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "Διαμοιρασμός του {item} με τον {user}" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" -msgstr "Σταμάτημα διαμοιρασμού" +msgstr "Διακοπή διαμοιρασμού" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "ειδοποίηση με email" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "δυνατότητα αλλαγής" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "έλεγχος πρόσβασης" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "δημιουργία" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "ενημέρωση" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "διαγραφή" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "διαμοιρασμός" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "Προστασία με συνθηματικό" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "Αποστολή..." -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "Το Email απεστάλη " -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" msgstr "Προειδοποίηση" @@ -577,7 +578,7 @@ msgstr "Εφαρμογές" #: strings.php:8 msgid "Admin" -msgstr "Διαχειριστής" +msgstr "Διαχείριση" #: strings.php:9 msgid "Help" diff --git a/l10n/el/files.po b/l10n/el/files.po index 12030b417fd..b2cbbde59fa 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -9,13 +9,14 @@ # frerisp <petrosfreris@gmail.com>, 2013 # pe_ppe <peppe@cs.uoi.gr>, 2014 # vkehayas <vkehayas@gmail.com>, 2013 +# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 21:50+0000\n" +"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -333,7 +334,7 @@ msgstr "Απαραίτητο για κατέβασμα πολλαπλών αρχ #: templates/admin.php:16 msgid "Enable ZIP-download" -msgstr "Ενεργοποίηση κατεβάσματος ZIP" +msgstr "Επιτρέπεται η λήψη ZIP" #: templates/admin.php:19 msgid "0 is unlimited" diff --git a/l10n/el/lib.po b/l10n/el/lib.po index 49613a13f1c..35ac8cf3935 100644 --- a/l10n/el/lib.po +++ b/l10n/el/lib.po @@ -7,13 +7,14 @@ # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013 # pe_ppe <peppe@cs.uoi.gr>, 2014 # vkehayas <vkehayas@gmail.com>, 2013-2014 +# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 21:50+0000\n" +"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,9 +51,9 @@ msgstr "Χρήστες" #: private/app.php:402 msgid "Admin" -msgstr "Διαχειριστής" +msgstr "Διαχείριση" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Αποτυχία αναβάθμισης του \"%s\"." @@ -77,7 +78,7 @@ msgstr "Η λήψη ZIP απενεργοποιήθηκε." msgid "Files need to be downloaded one by one." msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα." -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "Πίσω στα Αρχεία" @@ -151,15 +152,15 @@ msgstr "Δεν είναι δυνατόν να δημιουργηθεί ο φάκ msgid "Application is not enabled" msgstr "Δεν ενεργοποιήθηκε η εφαρμογή" -#: private/json.php:40 private/json.php:63 private/json.php:88 +#: private/json.php:40 private/json.php:62 private/json.php:87 msgid "Authentication error" msgstr "Σφάλμα πιστοποίησης" -#: private/json.php:52 +#: private/json.php:51 msgid "Token expired. Please reload page." msgstr "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα." -#: private/json.php:75 +#: private/json.php:74 msgid "Unknown user" msgstr "Άγνωστος χρήστης" @@ -293,68 +294,68 @@ msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«" msgid "Could not find category \"%s\"" msgstr "Αδυναμία εύρεσης κατηγορίας \"%s\"" -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "%n λεπτά πριν" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "%n ώρες πριν" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "σήμερα" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "χτες" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "%n ημέρες πριν" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "τελευταίο μήνα" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "%n μήνες πριν" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "τελευταίο χρόνο" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "χρόνια πριν" -#: private/user/manager.php:246 +#: private/user/manager.php:232 msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" msgstr "" -#: private/user/manager.php:251 +#: private/user/manager.php:237 msgid "A valid username must be provided" msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη" -#: private/user/manager.php:255 +#: private/user/manager.php:241 msgid "A valid password must be provided" msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό" -#: private/user/manager.php:260 +#: private/user/manager.php:246 msgid "The username is already being used" msgstr "" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 652efd0b275..667c9d73d98 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 22:10+0000\n" +"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -463,11 +463,11 @@ msgstr "Η τελευταία εκτέλεση του cron ήταν στις %s. #: templates/admin.php:174 msgid "Cron was not executed yet!" -msgstr "Η διεργασία cron δεν εκτελέστηκε ακόμα!" +msgstr "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!" #: templates/admin.php:184 msgid "Execute one task with each page loaded" -msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται" +msgstr "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα" #: templates/admin.php:192 msgid "" @@ -485,52 +485,52 @@ msgstr "Διαμοιρασμός" #: templates/admin.php:211 msgid "Enable Share API" -msgstr "Ενεργοποίηση API Διαμοιρασμού" +msgstr "Ενεργοποίηση API διαμοιρασμού" #: templates/admin.php:212 msgid "Allow apps to use the Share API" -msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού" +msgstr "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές " #: templates/admin.php:219 msgid "Allow links" -msgstr "Να επιτρέπονται σύνδεσμοι" +msgstr "Επιτρέπονται οι σύνδεσμοι" #: templates/admin.php:220 msgid "Allow users to share items to the public with links" -msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους" +msgstr "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους" #: templates/admin.php:227 msgid "Allow public uploads" -msgstr "Επιτρέψτε κοινόχρηστο ανέβασμα" +msgstr "Επιτρέπεται το κοινόχρηστο ανέβασμα" #: templates/admin.php:228 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "Επιτρέψτε στους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους" +msgstr "Επιτρέπει τους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους" #: templates/admin.php:235 msgid "Allow resharing" -msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός" +msgstr "Επιτρέπεται ο επαναδιαμοιρασμός" #: templates/admin.php:236 msgid "Allow users to share items shared with them again" -msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί" +msgstr "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί" #: templates/admin.php:243 msgid "Allow users to share with anyone" -msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε" +msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε" #: templates/admin.php:246 msgid "Allow users to only share with users in their groups" -msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας" +msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας" #: templates/admin.php:253 msgid "Allow mail notification" -msgstr "Επιτρέψτε ειδοποιήσεις ηλεκτρονικού ταχυδρομείου" +msgstr "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου" #: templates/admin.php:254 msgid "Allow user to send mail notification for shared files" -msgstr "Επιτρέψτε στο χρήστη να στέλνει ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία" +msgstr "Επιτρέπει τους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία" #: templates/admin.php:261 msgid "Security" @@ -543,7 +543,7 @@ msgstr "Επιβολή χρήσης HTTPS" #: templates/admin.php:276 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." -msgstr "Επιβάλλει τους δέκτες να συνδέονται με το %s μέσω κρυπογραφημένης σύνδεσης." +msgstr "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης." #: templates/admin.php:282 #, php-format diff --git a/l10n/gl/core.po b/l10n/gl/core.po index c3754b7adb6..75ebd80fdfc 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"PO-Revision-Date: 2014-04-18 11:20+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -172,7 +172,7 @@ msgstr "onte" msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "hai %n día" -msgstr[1] "hai %n días" +msgstr[1] "vai %n días" #: js/js.js:1105 msgid "last month" @@ -296,12 +296,12 @@ msgstr "Compartir" msgid "Share" msgstr "Compartir" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Erro" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "Produciuse un erro ao compartir" @@ -365,71 +365,71 @@ msgstr "Compartir por correo:" msgid "No people found" msgstr "Non se atopou xente" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "grupo" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "Non se permite volver a compartir" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "Compartido en {item} con {user}" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "Deixar de compartir" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "notificar por correo" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "pode editar" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "control de acceso" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "crear" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "actualizar" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "eliminar" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "compartir" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "Protexido con contrasinal" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "Produciuse un erro ao retirar a data de caducidade" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "Produciuse un erro ao definir a data de caducidade" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "Enviando..." -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "Correo enviado" -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" msgstr "Aviso" diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index c112809faad..85c9c04058d 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 07:30+0000\n" +"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"PO-Revision-Date: 2014-04-18 11:20+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgstr "Usuarios" msgid "Admin" msgstr "Administración" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Non foi posíbel anovar «%s»." @@ -291,68 +291,68 @@ msgstr "%s compartiu «%s» con vostede" msgid "Could not find category \"%s\"" msgstr "Non foi posíbel atopar a categoría «%s»" -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "segundos atrás" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "hai %n minuto" msgstr[1] "hai %n minutos" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "hai %n hora" msgstr[1] "hai %n horas" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "hoxe" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "onte" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "hai %n día" -msgstr[1] "hai %n días" +msgstr[1] "vai %n días" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "último mes" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "hai %n mes" msgstr[1] "hai %n meses" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "último ano" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "anos atrás" -#: private/user/manager.php:246 +#: private/user/manager.php:232 msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" msgstr "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»" -#: private/user/manager.php:251 +#: private/user/manager.php:237 msgid "A valid username must be provided" msgstr "Debe fornecer un nome de usuario" -#: private/user/manager.php:255 +#: private/user/manager.php:241 msgid "A valid password must be provided" msgstr "Debe fornecer un contrasinal" -#: private/user/manager.php:260 +#: private/user/manager.php:246 msgid "The username is already being used" msgstr "Este nome de usuario xa está a ser usado" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index f867acbd3d0..510618e32b3 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" +"Last-Translator: mateju <>\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" @@ -246,7 +246,7 @@ msgstr "Nove datoteke" #: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Obstoječe datoteke" #: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" @@ -306,12 +306,12 @@ msgstr "V souporabi" msgid "Share" msgstr "Souporaba" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Napaka" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "Napaka med souporabo" @@ -375,71 +375,71 @@ msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:" msgid "No people found" msgstr "Ni najdenih uporabnikov" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "skupina" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "Nadaljnja souporaba ni dovoljena" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "V souporabi v {item} z uporabnikom {user}" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "Prekliči souporabo" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "obvesti po elektronski pošti" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "lahko ureja" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "nadzor dostopa" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "ustvari" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "posodobi" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "izbriše" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "določi souporabo" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "Zaščiteno z geslom" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "Napaka brisanja datuma preteka" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "Napaka nastavljanja datuma preteka" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "Pošiljanje ..." -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "Elektronska pošta je poslana" -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" msgstr "Opozorilo" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index 46ee2ccbc17..f3e8a74c37a 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" +"Last-Translator: mateju <>\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" @@ -42,34 +42,34 @@ msgstr "Napaka nastavljanja shrambe Google Drive" msgid "Saved" msgstr "Shranjeno" -#: lib/config.php:592 +#: lib/config.php:598 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>Opomba:</b> " -#: lib/config.php:602 +#: lib/config.php:608 msgid " and " -msgstr "" +msgstr "in" -#: lib/config.php:624 +#: lib/config.php:630 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika." -#: lib/config.php:626 +#: lib/config.php:632 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika." -#: lib/config.php:628 +#: lib/config.php:634 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 6593ed803c0..fd0b2af9f9e 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" +"Last-Translator: mateju <>\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" @@ -50,7 +50,7 @@ msgstr "Uporabniki" msgid "Admin" msgstr "Skrbništvo" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Posodabljanje \"%s\" je spodletelo." @@ -75,7 +75,7 @@ msgstr "Prejemanje datotek v paketu ZIP je onemogočeno." msgid "Files need to be downloaded one by one." msgstr "Datoteke je mogoče prejeti le posamično." -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "Nazaj na datoteke" @@ -149,15 +149,15 @@ msgstr "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s" msgid "Application is not enabled" msgstr "Program ni omogočen" -#: private/json.php:40 private/json.php:63 private/json.php:88 +#: private/json.php:40 private/json.php:62 private/json.php:87 msgid "Authentication error" msgstr "Napaka overjanja" -#: private/json.php:52 +#: private/json.php:51 msgid "Token expired. Please reload page." msgstr "Žeton je potekel. Stran je treba ponovno naložiti." -#: private/json.php:75 +#: private/json.php:74 msgid "Unknown user" msgstr "Neznan uporabnik" @@ -291,11 +291,11 @@ msgstr "%s je omogočil souporabo »%s«" msgid "Could not find category \"%s\"" msgstr "Kategorije \"%s\" ni mogoče najti." -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "pred %n minuto" @@ -303,7 +303,7 @@ msgstr[1] "pred %n minutama" msgstr[2] "pred %n minutami" msgstr[3] "pred %n minutami" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "pred %n uro" @@ -311,15 +311,15 @@ msgstr[1] "pred %n urama" msgstr[2] "pred %n urami" msgstr[3] "pred %n urami" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "danes" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "včeraj" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "pred %n dnevom" @@ -327,11 +327,11 @@ msgstr[1] "pred %n dnevoma" msgstr[2] "pred %n dnevi" msgstr[3] "pred %n dnevi" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "zadnji mesec" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "pred %n mesecem" @@ -339,28 +339,28 @@ msgstr[1] "pred %n mesecema" msgstr[2] "pred %n meseci" msgstr[3] "pred %n meseci" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "lansko leto" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "let nazaj" -#: private/user/manager.php:246 +#: private/user/manager.php:232 msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" -#: private/user/manager.php:251 +#: private/user/manager.php:237 msgid "A valid username must be provided" msgstr "Navedeno mora biti veljavno uporabniško ime" -#: private/user/manager.php:255 +#: private/user/manager.php:241 msgid "A valid password must be provided" msgstr "Navedeno mora biti veljavno geslo" -#: private/user/manager.php:260 +#: private/user/manager.php:246 msgid "The username is already being used" -msgstr "" +msgstr "Vpisano uporabniško ime je že v uporabi" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index b96a0995a28..0b2245ab078 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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" @@ -295,12 +295,12 @@ msgstr "" msgid "Share" msgstr "" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:732 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "" -#: js/share.js:160 js/share.js:788 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "" @@ -364,71 +364,71 @@ msgstr "" msgid "No people found" msgstr "" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "" -#: js/share.js:719 +#: js/share.js:721 msgid "Password protected" msgstr "" -#: js/share.js:732 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:750 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "" -#: js/share.js:775 +#: js/share.js:777 msgid "Sending ..." msgstr "" -#: js/share.js:786 +#: js/share.js:788 msgid "Email sent" msgstr "" -#: js/share.js:810 +#: js/share.js:812 msgid "Warning" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index c3f090f1479..5d016437f58 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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 4ea46413f47..3ebc52afb2c 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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 d77884d6717..c05cc89332a 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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 a041a4ac2bf..14a3151d37b 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 3f78afda2ac..c4de45e2172 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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" @@ -39,7 +39,7 @@ msgstr "" msgid "Deleted Files" msgstr "" -#: lib/trashbin.php:859 lib/trashbin.php:861 +#: lib/trashbin.php:861 lib/trashbin.php:863 msgid "restored" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 0d7041f4bd5..9f25be229f3 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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 db37d225f96..805e0b895cc 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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" @@ -49,7 +49,7 @@ msgstr "" msgid "Admin" msgstr "" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "" @@ -74,7 +74,7 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "" @@ -148,15 +148,15 @@ msgstr "" msgid "Application is not enabled" msgstr "" -#: private/json.php:40 private/json.php:63 private/json.php:88 +#: private/json.php:40 private/json.php:62 private/json.php:87 msgid "Authentication error" msgstr "" -#: private/json.php:52 +#: private/json.php:51 msgid "Token expired. Please reload page." msgstr "" -#: private/json.php:75 +#: private/json.php:74 msgid "Unknown user" msgstr "" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index 536c63ebced..2cac8f8b917 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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" @@ -49,7 +49,7 @@ msgstr "" msgid "Admin" msgstr "" -#: app.php:875 +#: app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "" @@ -74,7 +74,7 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:234 files.php:262 +#: files.php:234 files.php:261 msgid "Back to Files" msgstr "" @@ -148,15 +148,15 @@ msgstr "" msgid "Application is not enabled" msgstr "" -#: json.php:40 json.php:63 json.php:88 +#: json.php:40 json.php:62 json.php:87 msgid "Authentication error" msgstr "" -#: json.php:52 +#: json.php:51 msgid "Token expired. Please reload page." msgstr "" -#: json.php:75 +#: json.php:74 msgid "Unknown user" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 170f6cf074c..56bf1970deb 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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 1b92a29313a..9bb697c59ce 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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_webdavauth.pot b/l10n/templates/user_webdavauth.pot index e60c51e5038..ad4ebbcb2d8 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\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/tr/core.po b/l10n/tr/core.po index 08945e62394..51a7eb73b68 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 21:49+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -188,7 +188,7 @@ msgstr[1] "%n ay önce" #: js/js.js:1107 msgid "months ago" -msgstr "ay önce" +msgstr "aylar önce" #: js/js.js:1108 msgid "last year" @@ -196,7 +196,7 @@ msgstr "geçen yıl" #: js/js.js:1109 msgid "years ago" -msgstr "yıl önce" +msgstr "yıllar önce" #: js/oc-dialogs.js:125 msgid "Choose" @@ -298,12 +298,12 @@ msgstr "Paylaşılan" msgid "Share" msgstr "Paylaş" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:732 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Hata" -#: js/share.js:160 js/share.js:788 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "Paylaşım sırasında hata" @@ -313,7 +313,7 @@ msgstr "Paylaşım iptal edilirken hata" #: js/share.js:178 msgid "Error while changing permissions" -msgstr "İzinleri değiştirirken hata oluştu" +msgstr "İzinleri değiştirirken hata" #: js/share.js:188 msgid "Shared with you and the group {group} by {owner}" @@ -341,7 +341,7 @@ msgstr "Parola" #: js/share.js:230 msgid "Allow Public Upload" -msgstr "Genel Gönderime İzin Ver" +msgstr "Herkes Tarafından Gönderime İzin Ver" #: js/share.js:234 msgid "Email link to person" @@ -361,77 +361,77 @@ msgstr "Son kullanım tarihi" #: js/share.js:277 msgid "Share via email:" -msgstr "E-posta ile paylaş" +msgstr "E-posta ile paylaş:" #: js/share.js:280 msgid "No people found" msgstr "Kişi bulunamadı" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "grup" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "Tekrar paylaşmaya izin verilmiyor" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "{item} içinde {user} ile paylaşılanlar" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "Paylaşılmayan" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "e-posta ile bildir" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "düzenleyebilir" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "erişim kontrolü" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "oluştur" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "güncelle" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "sil" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "paylaş" -#: js/share.js:719 +#: js/share.js:721 msgid "Password protected" msgstr "Parola korumalı" -#: js/share.js:732 +#: js/share.js:734 msgid "Error unsetting expiration date" -msgstr "Geçerlilik tarihi tanımlama kaldırma hatası" +msgstr "Son kullanma tarihi kaldırma hatası" -#: js/share.js:750 +#: js/share.js:752 msgid "Error setting expiration date" -msgstr "Geçerlilik tarihi tanımlama hatası" +msgstr "Son kullanma tarihi ayarlama hatası" -#: js/share.js:775 +#: js/share.js:777 msgid "Sending ..." msgstr "Gönderiliyor..." -#: js/share.js:786 +#: js/share.js:788 msgid "Email sent" msgstr "E-posta gönderildi" -#: js/share.js:810 +#: js/share.js:812 msgid "Warning" msgstr "Uyarı" @@ -472,11 +472,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." +msgstr "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin." #: js/update.js:21 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor." +msgstr "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz." #: lostpassword/controller.php:70 #, php-format @@ -487,7 +487,7 @@ msgstr "%s parola sıfırlama" msgid "" "A problem has occurred whilst sending the email, please contact your " "administrator." -msgstr "E-posta gönderilirken bir hata oluştu. Lütfen yönetinizle iletişime geçin." +msgstr "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin." #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -498,7 +498,7 @@ msgid "" "The link to reset your password has been sent to your email.<br>If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator ." -msgstr "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br> Eğer yine bulamazsanız sistem yöneticinize sorunuz." +msgstr "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br>Eğer yine bulamazsanız sistem yöneticinize danışın." #: lostpassword/templates/lostpassword.php:15 msgid "Request failed!<br>Did you make sure your email/username was right?" @@ -506,7 +506,7 @@ msgstr "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru o #: lostpassword/templates/lostpassword.php:18 msgid "You will receive a link to reset your password via Email." -msgstr "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız." +msgstr "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız." #: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 #: templates/login.php:32 @@ -519,7 +519,7 @@ msgid "" "will be no way to get your data back after your password is reset. If you " "are not sure what to do, please contact your administrator before you " "continue. Do you really want to continue?" -msgstr "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?" +msgstr "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?" #: lostpassword/templates/lostpassword.php:27 msgid "Yes, I really want to reset my password now" @@ -550,7 +550,7 @@ msgstr "Parolayı sıfırla" msgid "" "Mac OS X is not supported and %s will not work properly on this platform. " "Use it at your own risk! " -msgstr "Mac OS X desteklenmemediğinden %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!" +msgstr "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!" #: setup/controller.php:144 msgid "" @@ -595,7 +595,7 @@ msgstr "Etiketleme hatası" #: tags/controller.php:86 msgid "Error untagging" -msgstr "Etiket kaldırılırken hata" +msgstr "Etiket kaldırma hatası" #: tags/controller.php:97 msgid "Error favoriting" @@ -607,7 +607,7 @@ msgstr "Beğeniden kaldırılırken hata" #: templates/403.php:12 msgid "Access forbidden" -msgstr "Erişim yasaklı" +msgstr "Erişim yasak" #: templates/404.php:15 msgid "Cloud not found" @@ -630,7 +630,7 @@ msgstr "Bu paylaşım %s tarihinde sona erecek." #: templates/altmail.php:7 templates/mail.php:20 msgid "Cheers!" -msgstr "Şerefe!" +msgstr "Hoşça kalın!" #: templates/installation.php:25 templates/installation.php:32 #: templates/installation.php:39 @@ -662,7 +662,7 @@ msgstr "Güvenli rastgele sayı üreticisi olmadan saldırganlar parola sıfırl msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık." +msgstr "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık." #: templates/installation.php:42 #, php-format @@ -685,7 +685,7 @@ msgstr "Veri klasörü" #: templates/installation.php:90 msgid "Configure the database" -msgstr "Veritabanını ayarla" +msgstr "Veritabanını yapılandır" #: templates/installation.php:94 msgid "will be used" @@ -729,7 +729,7 @@ msgstr "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesi #: templates/layout.user.php:44 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "%s mevcut. Güncelleştirme hakkında daha fazla bilgi alın." +msgstr "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın." #: templates/layout.user.php:74 templates/singleuser.user.php:8 msgid "Log out" @@ -755,7 +755,7 @@ msgstr "Sunucu taraflı yetkilendirme başarısız!" #: templates/login.php:18 msgid "Please contact your administrator." -msgstr "Lütfen sistem yöneticisi ile iletişime geçin." +msgstr "Lütfen sistem yöneticiniz ile iletişime geçin." #: templates/login.php:46 msgid "Lost your password?" @@ -778,7 +778,7 @@ msgstr "Alternatif Girişler" msgid "" "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " "with you.<br><a href=\"%s\">View it!</a><br><br>" -msgstr "Merhaba, <br><br> %s sizinle <strong>%s</strong> paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>" +msgstr "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>" #: templates/singleuser.user.php:3 msgid "This ownCloud instance is currently in single user mode." @@ -801,7 +801,7 @@ msgstr "Sabrınız için teşekkür ederiz." #: templates/update.admin.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "Owncloud %s sürümüne güncelleniyor. Biraz zaman alabilir." +msgstr "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir." #: templates/update.user.php:3 msgid "" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index b8465fffa99..cf5079ec50c 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 06:30+0000\n" -"Last-Translator: Emre Saracoglu <emresaracoglu@live.com>\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" +"Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +25,7 @@ msgstr "" #: ajax/move.php:15 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "%s taşınamadı. Bu isimde dosya zaten var." +msgstr "%s taşınamadı. Bu isimde dosya zaten mevcut" #: ajax/move.php:25 ajax/move.php:28 #, php-format diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po index e12ff2554ce..461d684d2ab 100644 --- a/l10n/tr/files_sharing.po +++ b/l10n/tr/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-13 01:55-0400\n" -"PO-Revision-Date: 2014-03-12 10:51+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: js/share.js:13 +#: js/share.js:33 msgid "Shared by {owner}" msgstr "{owner} tarafından paylaşılmış" diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index fa1e63236ea..d8048f25bd3 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-11 14:15+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 13:52+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "Kullanıcılar" msgid "Admin" msgstr "Yönetici" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "\"%s\" yükseltme başarısız oldu." @@ -77,7 +77,7 @@ msgstr "ZIP indirmeleri kapatıldı." msgid "Files need to be downloaded one by one." msgstr "Dosyaların birer birer indirilmesi gerekmektedir." -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "Dosyalara dön" @@ -151,15 +151,15 @@ msgstr "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s" msgid "Application is not enabled" msgstr "Uygulama etkinleştirilmedi" -#: private/json.php:40 private/json.php:63 private/json.php:88 +#: private/json.php:40 private/json.php:62 private/json.php:87 msgid "Authentication error" msgstr "Kimlik doğrulama hatası" -#: private/json.php:52 +#: private/json.php:51 msgid "Token expired. Please reload page." msgstr "Jetonun süresi geçti. Lütfen sayfayı yenileyin." -#: private/json.php:75 +#: private/json.php:74 msgid "Unknown user" msgstr "Bilinmeyen kullanıcı" @@ -293,68 +293,68 @@ msgstr "%s sizinle »%s« paylaşımında bulundu" msgid "Could not find category \"%s\"" msgstr "\"%s\" kategorisi bulunamadı" -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "saniyeler önce" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "%n dakika önce" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "%n saat önce" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "bugün" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "dün" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "%n gün önce" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "geçen ay" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "%n ay önce" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "geçen yıl" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "yıl önce" -#: private/user/manager.php:246 +#: private/user/manager.php:232 msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" msgstr "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\"" -#: private/user/manager.php:251 +#: private/user/manager.php:237 msgid "A valid username must be provided" msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı" -#: private/user/manager.php:255 +#: private/user/manager.php:241 msgid "A valid password must be provided" msgstr "Geçerli bir parola mutlaka sağlanmalı" -#: private/user/manager.php:260 +#: private/user/manager.php:246 msgid "The username is already being used" msgstr "Bu kullanıcı adı zaten kullanımda" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index deb25c1af2c..1ba73232a77 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor." #: admin/controller.php:94 msgid "" "A problem occurred while sending the e-mail. Please revisit your settings." -msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin." +msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın." #: admin/controller.php:99 msgid "Email sent" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 8a7ded5dfe3..85c83056111 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 16:38+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 2f81ecf4ea7..8a5f79f1669 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-22 01:54-0400\n" +"PO-Revision-Date: 2014-04-21 14:43+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -294,12 +294,12 @@ msgstr "已共享" msgid "Share" msgstr "分享" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "错误" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "共享时出错" @@ -363,71 +363,71 @@ msgstr "通过Email共享" msgid "No people found" msgstr "未找到此人" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "组" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "不允许二次共享" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "在 {item} 与 {user} 共享。" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "取消共享" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "以邮件通知" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "可以修改" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "访问控制" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "创建" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "更新" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "删除" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "共享" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "密码已受保护" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "取消设置过期日期时出错" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "设置过期日期时出错" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "正在发送..." -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "邮件已发送" -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" msgstr "警告" diff --git a/lib/base.php b/lib/base.php index 7098f480e27..83f54a8e4db 100644 --- a/lib/base.php +++ b/lib/base.php @@ -185,7 +185,6 @@ class OC { if (file_exists(self::$configDir . "/config.php") and !is_writable(self::$configDir . "/config.php") ) { - $defaults = new OC_Defaults(); if (self::$CLI) { echo "Can't write into config directory!\n"; echo "This can usually be fixed by giving the webserver write access to the config directory\n"; @@ -305,6 +304,11 @@ class OC { } } + /** + * Checks if the version requires an update and shows + * @param bool $showTemplate Whether an update screen should get shown + * @return bool|void + */ public static function checkUpgrade($showTemplate = true) { if (self::needUpgrade()) { if ($showTemplate && !OC_Config::getValue('maintenance', false)) { @@ -799,6 +803,11 @@ class OC { self::handleLogin(); } + /** + * Load a PHP file belonging to the specified application + * @param array $param The application and file to load + * @return bool Whether the file has been found (will return 404 and false if not) + */ public static function loadAppScriptFile($param) { OC_App::loadApps(); $app = $param['app']; @@ -841,6 +850,10 @@ class OC { OC_Util::displayLoginPage(array_unique($error)); } + /** + * Remove outdated and therefore invalid tokens for a user + * @param string $user + */ protected static function cleanupLoginTokens($user) { $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); $tokens = OC_Preferences::getKeys($user, 'login_token'); @@ -852,6 +865,10 @@ class OC { } } + /** + * Try to login a user via HTTP authentication + * @return bool|void + */ protected static function tryApacheAuth() { $return = OC_User::handleApacheAuth(); @@ -866,6 +883,10 @@ class OC { return is_null($return) ? false : true; } + /** + * Try to login a user using the remember me cookie. + * @return bool Whether the provided cookie was valid + */ protected static function tryRememberLogin() { if (!isset($_COOKIE["oc_remember_login"]) || !isset($_COOKIE["oc_token"]) @@ -907,6 +928,10 @@ class OC { return true; } + /** + * Tries to login a user using the formbased authentication + * @return bool|void + */ protected static function tryFormLogin() { if (!isset($_POST["user"]) || !isset($_POST['password'])) { return false; @@ -941,6 +966,10 @@ class OC { return true; } + /** + * Try to login a user using HTTP authentication. + * @return bool + */ protected static function tryBasicAuthLogin() { if (!isset($_SERVER["PHP_AUTH_USER"]) || !isset($_SERVER["PHP_AUTH_PW"]) @@ -959,6 +988,10 @@ class OC { } if (!function_exists('get_temp_dir')) { + /** + * Get the temporary dir to store uploaded data + * @return null|string Path to the temporary directory or null + */ function get_temp_dir() { if ($temp = ini_get('upload_tmp_dir')) return $temp; if ($temp = getenv('TMP')) return $temp; diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index d535b97f631..8348f7ef0dc 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -67,6 +67,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"), "last year" => "minulý rok", "years ago" => "před lety", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" => "Musíte zadat platné uživatelské jméno", "A valid password must be provided" => "Musíte zadat platné heslo", "The username is already being used" => "Uživatelské jméno je již využíváno" diff --git a/lib/l10n/el.php b/lib/l10n/el.php index 244cc50b847..109104e4061 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -6,7 +6,7 @@ $TRANSLATIONS = array( "Personal" => "Προσωπικά", "Settings" => "Ρυθμίσεις", "Users" => "Χρήστες", -"Admin" => "Διαχειριστής", +"Admin" => "Διαχείριση", "Failed to upgrade \"%s\"." => "Αποτυχία αναβάθμισης του \"%s\".", "Unknown filetype" => "Άγνωστος τύπος αρχείου", "Invalid image" => "Μη έγκυρη εικόνα", diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index 0da1695e37f..2a62b41e22d 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -62,7 +62,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"), "today" => "hoxe", "yesterday" => "onte", -"_%n day go_::_%n days ago_" => array("hai %n día","hai %n días"), +"_%n day go_::_%n days ago_" => array("hai %n día","vai %n días"), "last month" => "último mes", "_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"), "last year" => "último ano", diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 6f9470401ed..86172b5ab71 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -67,7 +67,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"), "last year" => "lansko leto", "years ago" => "let nazaj", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime", -"A valid password must be provided" => "Navedeno mora biti veljavno geslo" +"A valid password must be provided" => "Navedeno mora biti veljavno geslo", +"The username is already being used" => "Vpisano uporabniško ime je že v uporabi" ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php index 685809581ac..66aa039eb18 100755 --- a/lib/private/activitymanager.php +++ b/lib/private/activitymanager.php @@ -46,7 +46,7 @@ class ActivityManager implements IManager { $type, $priority); } catch (\Exception $ex) { - // TODO: log the excepetion + // TODO: log the exception } } diff --git a/lib/private/api.php b/lib/private/api.php index b3b5eb1067b..74887690952 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -127,9 +127,9 @@ class OC_API { /** * merge the returned result objects into one response * @param array $responses + * @return array|\OC_OCS_Result */ public static function mergeResponses($responses) { - $response = array(); // Sort into shipped and thirdparty $shipped = array( 'succeeded' => array(), @@ -191,7 +191,7 @@ class OC_API { // Merge the successful responses $data = array(); - foreach($responses as $app => $response) { + foreach($responses as $response) { if($response['shipped']) { $data = array_merge_recursive($response['response']->getData(), $data); } else { diff --git a/lib/private/app.php b/lib/private/app.php index c5fcad8f005..2f55b54b328 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -568,7 +568,7 @@ class OC_App{ /** * @brief Returns the navigation - * @return string + * @return array * * This function returns an array containing all entries added. The * entries are sorted by the key 'order' ascending. Additional to the keys diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index fed6989a438..0cd6b3bc35b 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -71,6 +71,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @param string $app + * @return \string[] */ private function getAppValues($app) { $appCache = $this->getAppCache($app); diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php index bb02d565fa4..0f160d224ad 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/appframework/middleware/security/securitymiddleware.php @@ -25,8 +25,8 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; -use OC\AppFramework\Http\RedirectResponse; use OC\AppFramework\Utility\MethodAnnotationReader; +use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\JSONResponse; diff --git a/lib/private/archive.php b/lib/private/archive.php index 6f51066ddf8..a62f22cf6d7 100644 --- a/lib/private/archive.php +++ b/lib/private/archive.php @@ -10,7 +10,7 @@ abstract class OC_Archive{ /** * open any of the supported archive types * @param string $path - * @return OC_Archive + * @return OC_Archive|void */ public static function open($path) { $ext=substr($path, strrpos($path, '.')); @@ -29,6 +29,9 @@ abstract class OC_Archive{ } } + /** + * @param $source + */ abstract function __construct($source); /** * add an empty folder to the archive @@ -39,7 +42,7 @@ abstract class OC_Archive{ /** * add a file to the archive * @param string $path - * @param string source either a local file or string data + * @param string $source either a local file or string data * @return bool */ abstract function addFile($path, $source=''); diff --git a/lib/private/arrayparser.php b/lib/private/arrayparser.php index d353e486577..a5e1f6653fc 100644 --- a/lib/private/arrayparser.php +++ b/lib/private/arrayparser.php @@ -32,6 +32,7 @@ class ArrayParser { /** * @param string $string + * @return array|bool|int|null|string */ function parsePHP($string) { $string = $this->stripPHPTags($string); @@ -41,6 +42,7 @@ class ArrayParser { /** * @param string $string + * @return string */ function stripPHPTags($string) { $string = trim($string); @@ -55,6 +57,7 @@ class ArrayParser { /** * @param string $string + * @return string */ function stripAssignAndReturn($string) { $string = trim($string); @@ -67,6 +70,10 @@ class ArrayParser { return $string; } + /** + * @param string $string + * @return array|bool|int|null|string + */ function parse($string) { $string = trim($string); $string = trim($string, ';'); @@ -85,6 +92,7 @@ class ArrayParser { /** * @param string $string + * @return int */ function getType($string) { $string = strtolower($string); @@ -104,6 +112,7 @@ class ArrayParser { /** * @param string $string + * @return string */ function parseString($string) { return substr($string, 1, -1); @@ -111,6 +120,7 @@ class ArrayParser { /** * @param string $string + * @return int */ function parseNum($string) { return intval($string); @@ -118,6 +128,7 @@ class ArrayParser { /** * @param string $string + * @return bool */ function parseBool($string) { $string = strtolower($string); @@ -126,6 +137,7 @@ class ArrayParser { /** * @param string $string + * @return array */ function parseArray($string) { $body = substr($string, 5); @@ -157,6 +169,7 @@ class ArrayParser { /** * @param string $body + * @return array */ function splitArray($body) { $inSingleQuote = false;//keep track if we are inside quotes diff --git a/lib/private/files.php b/lib/private/files.php index bfe6d3c02da..152595ba697 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -231,7 +231,7 @@ class OC_Files { OC_Template::printErrorPage( $l->t('ZIP download is turned off.'), $l->t('Files need to be downloaded one by one.') - . '<br/><a href="javascript:history.back()">' . $l->t('Back to Files') . '</a>' + . '<br/><a href="'.OCP\Util::linkTo('files', 'index.php', array('dir' => $dir)).'">' . $l->t('Back to Files') . '</a>' ); exit; } @@ -258,8 +258,7 @@ class OC_Files { OC_Template::printErrorPage( $l->t('Selected files too large to generate zip file.'), $l->t('Please download the files separately in smaller chunks or kindly ask your administrator.') - .'<br/><a href="javascript:history.back()">' - . $l->t('Back to Files') . '</a>' + . '<br/><a href="'.OCP\Util::linkTo('files', 'index.php', array('dir' => $dir)).'">' . $l->t('Back to Files') . '</a>' ); exit; } diff --git a/lib/private/geo.php b/lib/private/geo.php index 7094d885af6..cd62511f0c1 100644 --- a/lib/private/geo.php +++ b/lib/private/geo.php @@ -6,15 +6,11 @@ * See the COPYING-README file. */ class OC_Geo{ - /* - * @brief returns the closest timezone to coordinates - * @param (string) $latitude - Latitude - * @param (string) $longitude - Longitude - * @return (string) $timezone - closest timezone - */ /** - * @param integer $latitude - * @param integer $longitude + * @brief returns the closest timezone to coordinates + * @param $latitude + * @param $longitude + * @return mixed Closest timezone */ public static function timezone($latitude, $longitude) { $alltimezones = DateTimeZone::listIdentifiers(); diff --git a/lib/private/group.php b/lib/private/group.php index 4c187b538af..d9f430f833b 100644 --- a/lib/private/group.php +++ b/lib/private/group.php @@ -200,6 +200,9 @@ class OC_Group { /** * @brief get a list of all groups + * @param string $search + * @param int|null $limit + * @param int|null $offset * @returns array with group names * * Returns a list with all groups @@ -225,6 +228,10 @@ class OC_Group { /** * @brief get a list of all users in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset * @returns array with user ids */ public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { @@ -260,6 +267,10 @@ class OC_Group { /** * @brief get a list of all display names in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset * @returns array with display names (value) and user ids(key) */ public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { diff --git a/lib/private/helper.php b/lib/private/helper.php index d5214823de9..ab1e0d38924 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -36,7 +36,7 @@ class OC_Helper { * @param array $parameters * @return * @internal param array $args with param=>value, will be appended to the returned url - * @returns the url + * @returns string the url * * Returns a url to the given app and file. */ diff --git a/lib/private/json.php b/lib/private/json.php index 34f81c3b8cf..4634d7adfea 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -43,8 +43,7 @@ class OC_JSON{ } /** - * @brief Check an ajax get/post call if the request token is valid. - * @return json Error msg if not valid. + * Check an ajax get/post call if the request token is valid, send json error msg if not. */ public static function callCheck() { if( !OC_Util::isCallRegistered()) { @@ -55,7 +54,7 @@ class OC_JSON{ } /** - * Check if the user is a admin, send json error msg if not + * Check if the user is a admin, send json error msg if not. */ public static function checkAdminUser() { if( !OC_User::isAdminUser(OC_User::getUser())) { diff --git a/lib/private/l10n.php b/lib/private/l10n.php index a397945b829..c7e4328161e 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -267,43 +267,18 @@ class OC_L10N implements \OCP\IL10N { $identifier = "_${text_singular}_::_${text_plural}_"; if( array_key_exists($identifier, $this->translations)) { return new OC_L10N_String( $this, $identifier, $parameters, $count ); - } - else{ + }else{ if($count === 1) { return new OC_L10N_String($this, $text_singular, $parameters, $count); - } - else{ + }else{ return new OC_L10N_String($this, $text_plural, $parameters, $count); } } } /** - * @brief Translating - * @param $textArray The text array we need a translation for - * @returns Translation or the same text - * - * Returns the translation. If no translation is found, $textArray will be - * returned. - * - * - * @deprecated deprecated since ownCloud version 5.0 - * This method will probably be removed with ownCloud 6.0 - * - * - */ - public function tA($textArray) { - OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.', OC_Log::WARN); - $result = array(); - foreach($textArray as $key => $text) { - $result[$key] = (string)$this->t($text); - } - return $result; - } - - /** * @brief getTranslations - * @returns Fetch all translations + * @returns array Fetch all translations * * Returns an associative array with all translations */ @@ -339,7 +314,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief get localizations - * @returns Fetch all localizations + * @returns array Fetch all localizations * * Returns an associative array with all localizations */ diff --git a/lib/private/migrate.php b/lib/private/migrate.php index 3fb3e334ea2..5bcc11b061b 100644 --- a/lib/private/migrate.php +++ b/lib/private/migrate.php @@ -69,9 +69,9 @@ class OC_Migrate{ /** * @brief exports a user, or owncloud instance - * @param optional $uid string user id of user to export if export type is user, defaults to current - * @param ootional $type string type of export, defualts to user - * @param otional $path string path to zip output folder + * @param string $uid user id of user to export if export type is user, defaults to current + * @param string $type type of export, defualts to user + * @param string $path path to zip output folder * @return string on error, path to zip on success */ public static function export( $uid=null, $type='user', $path=null ) { @@ -192,11 +192,12 @@ class OC_Migrate{ } /** - * @brief imports a user, or owncloud instance - * @param $path string path to zip - * @param optional $type type of import (user or instance) - * @param optional $uid userid of new user - */ + * @brief imports a user, or owncloud instance + * @param string $path path to zip + * @param string $type type of import (user or instance) + * @param string|null|int $uid userid of new user + * @return string + */ public static function import( $path, $type='user', $uid=null ) { $datadir = OC_Config::getValue( 'datadirectory' ); @@ -307,8 +308,8 @@ class OC_Migrate{ /** * @brief recursively deletes a directory - * @param string $dir string path of dir to delete - * $param optional $deleteRootToo bool delete the root directory + * @param string $dir path of dir to delete + * @param bool $deleteRootToo delete the root directory * @return bool */ private static function unlink_r( $dir, $deleteRootToo=true ) { @@ -406,7 +407,7 @@ class OC_Migrate{ /** * @brief generates json containing export info, and merges any data supplied - * @param optional $array array of data to include in the returned json + * @param array $array of data to include in the returned json * @return string */ static private function getExportInfo( $array=array() ) { @@ -430,8 +431,7 @@ class OC_Migrate{ /** * @brief connects to migration.db, or creates if not found - * @param $db optional path to migration.db, defaults to user data dir - * @param string $path + * @param string $path to migration.db, defaults to user data dir * @return bool whether the operation was successful */ static private function connectDB( $path=null ) { @@ -461,7 +461,7 @@ class OC_Migrate{ /** * @brief creates the tables in migration.db from an apps database.xml - * @param string $appid string id of the app + * @param string $appid id of the app * @return bool whether the operation was successful */ static private function createAppTables( $appid ) { @@ -499,7 +499,6 @@ class OC_Migrate{ /** * @brief tries to create the zip - * @param $path string path to zip destination * @return bool */ static private function createZip() { @@ -538,7 +537,7 @@ class OC_Migrate{ * @brief imports a new user * @param string $db string path to migration.db * @param $info object of migration info - * @param $uid optional uid to use + * @param string|null|int $uid uid to use * @return array of apps with import statuses, or false on failure. */ public static function importAppData( $db, $info, $uid=null ) { @@ -601,10 +600,10 @@ class OC_Migrate{ } - /* - * @brief creates a new user in the database - * @param $uid string user_id of the user to be created - * @param $hash string hash of the user to be created + /** + * creates a new user in the database + * @param string $uid user_id of the user to be created + * @param string $hash hash of the user to be created * @return bool result of user creation */ public static function createUser( $uid, $hash ) { diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php index 43eba89b8d5..b0e7a4e9528 100644 --- a/lib/private/migration/content.php +++ b/lib/private/migration/content.php @@ -36,7 +36,7 @@ class OC_Migration_Content{ * @brief sets up the * @param ZipArchive $zip ZipArchive object * @param $db a database object (required for exporttype user) - * @return boolean|null + * @return bool|null */ public function __construct( $zip, $db=null ) { diff --git a/lib/private/ocs.php b/lib/private/ocs.php index bbe965ce561..211e8222145 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -39,6 +39,7 @@ class OC_OCS { * @return string Data or if the key is not found and no default is set it will exit with a 400 Bad request */ public static function readData($method, $key, $type = 'raw', $default = null) { + $data = false; if ($method == 'get') { if (isset($_GET[$key])) { $data = $_GET[$key]; @@ -107,19 +108,19 @@ class OC_OCS { /** - * generates the xml or json response for the API call from an multidimenional data array. - * @param string $format - * @param string $status - * @param string $statuscode - * @param string $message - * @param array $data - * @param string $tag - * @param string $tagattribute - * @param int $dimension - * @param int $itemscount - * @param int $itemsperpage - * @return string xml/json - */ + * generates the xml or json response for the API call from an multidimenional data array. + * @param string $format + * @param string $status + * @param string $statuscode + * @param string $message + * @param array $data + * @param string $tag + * @param string $tagattribute + * @param int $dimension + * @param int|string $itemscount + * @param int|string $itemsperpage + * @return string xml/json + */ private static function generateXml($format, $status, $statuscode, $message, $data=array(), $tag='', $tagattribute='', $dimension=-1, $itemscount='', $itemsperpage='') { if($format=='json') { @@ -212,6 +213,8 @@ class OC_OCS { } /** + * @param $writer + * @param $data * @param string $node */ public static function toXml($writer, $data, $node) { diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index 68dc2c2d6ec..b0480caf028 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -95,7 +95,8 @@ class OC_OCSClient{ * @returns array with application data * * This function returns a list of all the applications on the OCS server - * @param integer $page + * @param $categories + * @param int $page * @param string $filter */ public static function getApplications($categories, $page, $filter) { @@ -148,6 +149,7 @@ class OC_OCSClient{ /** * @brief Get an the applications from the OCS server + * @param string $id * @returns array with application data * * This function returns an applications from the OCS server @@ -189,12 +191,13 @@ class OC_OCSClient{ } /** - * @brief Get the download url for an application from the OCS server - * @returns array with application data - * - * This function returns an download url for an applications from the OCS server - * @param integer $item - */ + * @brief Get the download url for an application from the OCS server + * @returns array with application data + * + * This function returns an download url for an applications from the OCS server + * @param string $id + * @param integer $item + */ public static function getApplicationDownload($id, $item) { if(OC_Config::getValue('appstoreenabled', true)==false) { return null; diff --git a/lib/private/preview.php b/lib/private/preview.php index 0187b4aacbb..cdf22240382 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -72,6 +72,7 @@ class Preview { * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image * @param bool $scalingUp Disable/Enable upscaling of previews + * @throws \Exception * @return mixed (bool / string) * false if thumbnail does not exist * path to thumbnail if thumbnail exists @@ -172,6 +173,9 @@ class Preview { return $this->configMaxY; } + /** + * @return false|Files\FileInfo|\OCP\Files\FileInfo + */ protected function getFileInfo() { $absPath = $this->fileView->getAbsolutePath($this->file); $absPath = Files\Filesystem::normalizePath($absPath); @@ -211,6 +215,7 @@ class Preview { /** * @brief set the the max width of the preview * @param int $maxX + * @throws \Exception * @return $this */ public function setMaxX($maxX = 1) { @@ -231,6 +236,7 @@ class Preview { /** * @brief set the the max height of the preview * @param int $maxY + * @throws \Exception * @return $this */ public function setMaxY($maxY = 1) { @@ -401,6 +407,10 @@ class Preview { return $possibleThumbnails; } + /** + * @param string $name + * @return array + */ private function getDimensionsFromFilename($name) { $size = explode('-', $name); $x = (int) $size[0]; @@ -409,6 +419,11 @@ class Preview { return array($x, $y, $aspectRatio); } + /** + * @param int $x + * @param int $y + * @return bool + */ private function unscalable($x, $y) { $maxX = $this->getMaxX(); @@ -707,6 +722,7 @@ class Preview { /** * @param string $mimeType + * @return bool */ public static function isMimeSupported($mimeType) { if (!\OC_Config::getValue('enable_previews', true)) { diff --git a/lib/private/request.php b/lib/private/request.php index 93cb322f1b3..90f7488eea5 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -201,6 +201,7 @@ class OC_Request { /** * @brief get Path info from request, not urldecoded + * @throws Exception * @return string Path info or false when not found */ public static function getRawPathInfo() { diff --git a/lib/private/response.php b/lib/private/response.php index 983c682bf3f..1aa5e629b8b 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -50,7 +50,7 @@ class OC_Response { /** * @brief Set response status - * @param $status a HTTP status code, see also the STATUS constants + * @param int $status a HTTP status code, see also the STATUS constants */ static public function setStatus($status) { $protocol = $_SERVER['SERVER_PROTOCOL']; diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php index ad25372391f..6412ceb0418 100644 --- a/lib/private/route/cachingrouter.php +++ b/lib/private/route/cachingrouter.php @@ -31,7 +31,8 @@ class CachingRouter extends Router { * @return string */ public function generate($name, $parameters = array(), $absolute = false) { - $key = $name . json_encode($parameters) . $absolute; + sort($parameters); + $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . json_encode($parameters) . intval($absolute); if ($this->cache->hasKey($key)) { return $this->cache->get($key); } else { diff --git a/lib/private/search.php b/lib/private/search.php index 70d670e048e..3f540090fdd 100644 --- a/lib/private/search.php +++ b/lib/private/search.php @@ -45,7 +45,7 @@ class OC_Search{ /** * search all provider for $query - * @param string query + * @param string $query * @return array An array of OC_Search_Result's */ public static function search($query) { diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php index 8cda7240ac9..5b6072987ad 100644 --- a/lib/private/subadmin.php +++ b/lib/private/subadmin.php @@ -32,8 +32,8 @@ class OC_SubAdmin{ /** * @brief add a SubAdmin - * @param $uid uid of the SubAdmin - * @param $gid gid of the group + * @param string $uid uid of the SubAdmin + * @param string $gid gid of the group * @return boolean */ public static function createSubAdmin($uid, $gid) { @@ -45,8 +45,8 @@ class OC_SubAdmin{ /** * @brief delete a SubAdmin - * @param $uid uid of the SubAdmin - * @param $gid gid of the group + * @param string $uid uid of the SubAdmin + * @param string $gid gid of the group * @return boolean */ public static function deleteSubAdmin($uid, $gid) { @@ -58,7 +58,7 @@ class OC_SubAdmin{ /** * @brief get groups of a SubAdmin - * @param $uid uid of the SubAdmin + * @param string $uid uid of the SubAdmin * @return array */ public static function getSubAdminsGroups($uid) { @@ -73,7 +73,7 @@ class OC_SubAdmin{ /** * @brief get SubAdmins of a group - * @param $gid gid of the group + * @param string $gid gid of the group * @return array */ public static function getGroupsSubAdmins($gid) { @@ -102,8 +102,8 @@ class OC_SubAdmin{ /** * @brief checks if a user is a SubAdmin of a group - * @param $uid uid of the subadmin - * @param $gid gid of the group + * @param string $uid uid of the subadmin + * @param string $gid gid of the group * @return bool */ public static function isSubAdminofGroup($uid, $gid) { @@ -118,7 +118,7 @@ class OC_SubAdmin{ /** * @brief checks if a user is a SubAdmin - * @param $uid uid of the subadmin + * @param string $uid uid of the subadmin * @return bool */ public static function isSubAdmin($uid) { @@ -138,8 +138,8 @@ class OC_SubAdmin{ /** * @brief checks if a user is a accessible by a subadmin - * @param $subadmin uid of the subadmin - * @param $user uid of the user + * @param string $subadmin uid of the subadmin + * @param string $user uid of the user * @return bool */ public static function isUserAccessible($subadmin, $user) { diff --git a/lib/private/template.php b/lib/private/template.php index 610d5fbc8e5..3d18b52bac9 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -136,6 +136,7 @@ class OC_Template extends \OC\Template\Base { * @param string $theme * @param string $app * @param string $fext + * @return array */ protected function findTemplate($theme, $app, $name, $fext) { // Check if it is a app template or not. @@ -232,7 +233,7 @@ class OC_Template extends \OC\Template\Base { * @brief Shortcut to print a simple page for guests * @param string $application The application we render the template for * @param string $name Name of the template - * @param string $parameters Parameters for the template + * @param array|string $parameters Parameters for the template * @return bool */ public static function printGuestPage( $application, $name, $parameters = array() ) { @@ -261,7 +262,6 @@ class OC_Template extends \OC\Template\Base { * print error page using Exception details * @param Exception $exception */ - public static function printExceptionErrorPage(Exception $exception) { $error_msg = $exception->getMessage(); if ($exception->getCode()) { diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 0c0c8d9c8d7..b7ac02a753d 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -1,8 +1,6 @@ <?php use Assetic\Asset\AssetCollection; use Assetic\Asset\FileAsset; -use Assetic\Asset\GlobAsset; -use Assetic\AssetManager; use Assetic\AssetWriter; use Assetic\Filter\CssRewriteFilter; @@ -99,6 +97,10 @@ class OC_TemplateLayout extends OC_Template { } } + /** + * @param $styles + * @return array + */ static public function findStylesheetFiles($styles) { // Read the selected theme from the config file $theme = OC_Util::getTheme(); @@ -113,6 +115,10 @@ class OC_TemplateLayout extends OC_Template { return $locator->getResources(); } + /** + * @param $scripts + * @return array + */ static public function findJavascriptFiles($scripts) { // Read the selected theme from the config file $theme = OC_Util::getTheme(); @@ -168,6 +174,10 @@ class OC_TemplateLayout extends OC_Template { $this->append('cssfiles', OC_Helper::linkTo('assets', "$cssHash.css")); } + /** + * @param $files + * @return string + */ private static function hashScriptNames($files) { $files = array_map(function ($item) { diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index c28e6a7cb4c..a56b0fe3378 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -95,6 +95,7 @@ class URLGenerator implements IURLGenerator { * @brief Creates path to an image * @param string $app app * @param string $image image name + * @throws \RuntimeException If the image does not exist * @return string the url * * Returns the path to the image. diff --git a/lib/private/user.php b/lib/private/user.php index dc4c7ec3b61..7106d664aca 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -37,6 +37,10 @@ * logout() */ class OC_User { + + /** + * @return \OC\User\Session + */ public static function getUserSession() { return OC::$server->getUserSession(); } @@ -220,8 +224,8 @@ class OC_User { /** * @brief Try to login a user - * @param $uid The username of the user to log in - * @param $password The password of the user + * @param string $uid The username of the user to log in + * @param string $password The password of the user * @return boolean|null * * Log in a user and regenerate a new session - if the password is ok @@ -291,6 +295,8 @@ class OC_User { /** * @brief Sets user display name for session * @param string $uid + * @param null $displayName + * @return bool Whether the display name could get set */ public static function setDisplayName($uid, $displayName = null) { if (is_null($displayName)) { @@ -514,6 +520,7 @@ class OC_User { * @returns array with all uids * * Get a list of all users. + * @param string $search * @param integer $limit * @param integer $offset */ diff --git a/lib/private/util.php b/lib/private/util.php index e20de308e87..e6aa7b061b5 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -87,7 +87,9 @@ class OC_Util { } /** + * Get the quota of a user * @param string $user + * @return int Quota bytes */ public static function getUserQuota($user){ $config = \OC::$server->getConfig(); @@ -301,8 +303,6 @@ class OC_Util { return $errors; } - $defaults = new \OC_Defaults(); - $webServerRestart = false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) @@ -598,11 +598,11 @@ class OC_Util { } /** - * @return void + * @param array $errors */ public static function displayLoginPage($errors = array()) { $parameters = array(); - foreach( $errors as $key => $value ) { + foreach( $errors as $value ) { $parameters[$value] = true; } if (!empty($_POST['user'])) { @@ -827,12 +827,13 @@ class OC_Util { } /** - * @brief Check if the htaccess file is working + * @brief Check if the .htaccess file is working + * @throws OC\HintException If the testfile can't get written. * @return bool - * @description Check if the htaccess file is working by creating a test + * @description Check if the .htaccess file is working by creating a test * file in the data directory and trying to access via http */ - public static function isHtAccessWorking() { + public static function isHtaccessWorking() { if (!\OC_Config::getValue("check_for_working_htaccess", true)) { return true; } diff --git a/lib/private/vobject.php b/lib/private/vobject.php index 267176ebc07..a3e9f7ef790 100644 --- a/lib/private/vobject.php +++ b/lib/private/vobject.php @@ -36,8 +36,8 @@ class OC_VObject{ /** * @brief Parses the VObject - * @param string VObject as string - * @returns Sabre_VObject or null + * @param string $data VObject as string + * @returns Sabre\VObject\Reader|null */ public static function parse($data) { try { @@ -55,7 +55,7 @@ class OC_VObject{ /** * @brief Escapes semicolons - * @param string $value + * @param array $value * @return string */ public static function escapeSemicolons($value) { @@ -88,7 +88,7 @@ class OC_VObject{ } /** - * Constuctor + * Constructor * @param Sabre\VObject\Component or string */ public function __construct($vobject_or_name) { @@ -99,6 +99,11 @@ class OC_VObject{ } } + /** + * @todo Write documentation + * @param $item + * @param null $itemValue + */ public function add($item, $itemValue = null) { if ($item instanceof OC_VObject) { $item = $item->getVObject(); @@ -110,8 +115,8 @@ class OC_VObject{ * @brief Add property to vobject * @param object $name of property * @param object $value of property - * @param object $parameters of property - * @returns Sabre_VObject_Property newly created + * @param array|object $parameters of property + * @returns Sabre\VObject\Property newly created */ public function addProperty($name, $value, $parameters=array()) { if(is_array($value)) { @@ -131,6 +136,11 @@ class OC_VObject{ $this->vobject->add('UID', $uid); } + /** + * @todo Write documentation + * @param mixed $name + * @param string $string + */ public function setString($name, $string) { if ($string != '') { $string = strtr($string, array("\r\n"=>"\n")); @@ -145,7 +155,7 @@ class OC_VObject{ * When $datetime is set to 'now', use the current time * When $datetime is null, unset the property * - * @param string property name + * @param string $name * @param DateTime $datetime * @param int $dateType * @return void @@ -163,12 +173,22 @@ class OC_VObject{ } } + /** + * @todo Write documentation + * @param $name + * @return string + */ public function getAsString($name) { return $this->vobject->__isset($name) ? $this->vobject->__get($name)->value : ''; } + /** + * @todo Write documentation + * @param $name + * @return array + */ public function getAsArray($name) { $values = array(); if ($this->vobject->__isset($name)) { @@ -178,6 +198,11 @@ class OC_VObject{ return $values; } + /** + * @todo Write documentation + * @param $name + * @return array|OC_VObject|\Sabre\VObject\Property + */ public function &__get($name) { if ($name == 'children') { return $this->vobject->children; @@ -189,18 +214,38 @@ class OC_VObject{ return $return; } + /** + * @todo Write documentation + * @param string $name + * @param string $value + */ public function __set($name, $value) { return $this->vobject->__set($name, $value); } + /** + * @todo Write documentation + * @param string $name + */ public function __unset($name) { return $this->vobject->__unset($name); } + /** + * @todo Write documentation + * @param string $name + * @return bool + */ public function __isset($name) { return $this->vobject->__isset($name); } + /** + * @todo Write documentation + * @param $function + * @param $arguments + * @return mixed + */ public function __call($function, $arguments) { return call_user_func_array(array($this->vobject, $function), $arguments); } diff --git a/lib/private/appframework/http/downloadresponse.php b/lib/public/appframework/http/downloadresponse.php index 67b9542dba6..d3c2818e828 100644 --- a/lib/private/appframework/http/downloadresponse.php +++ b/lib/public/appframework/http/downloadresponse.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; /** diff --git a/lib/private/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php index 05353349065..416e1533635 100644 --- a/lib/private/appframework/http/redirectresponse.php +++ b/lib/public/appframework/http/redirectresponse.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http; diff --git a/lib/public/util.php b/lib/public/util.php index f02213f2446..f06ddd66641 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -57,7 +57,7 @@ class Util { * @param string $mailtext * @param string $fromaddress * @param string $fromname - * @param bool $html + * @param int $html * @param string $altbody * @param string $ccaddress * @param string $ccname @@ -85,7 +85,7 @@ class Util { * write exception into the log. Include the stack trace * if DEBUG mode is enabled * @param string $app app name - * @param Exception $ex exception to log + * @param \Exception $ex exception to log */ public static function logException( $app, \Exception $ex ) { $class = get_class($ex); @@ -156,6 +156,7 @@ class Util { * formats a timestamp in the "right" way * @param int $timestamp $timestamp * @param bool $dateOnly option to omit time from the result + * @return string timestamp */ public static function formatDate( $timestamp, $dateOnly=false) { return(\OC_Util::formatDate( $timestamp, $dateOnly )); @@ -203,9 +204,8 @@ class Util { * Creates an url using a defined route * @param $route * @param array $parameters - * @return * @internal param array $args with param=>value, will be appended to the returned url - * @return the url + * @return string the url */ public static function linkToRoute( $route, $parameters = array() ) { return \OC_Helper::linkToRoute($route, $parameters); @@ -284,8 +284,7 @@ class Util { /** * Returns the request uri, even if the website uses one or more reverse proxies - * - * @return the request uri + * @return string the request uri */ public static function getRequestUri() { return(\OC_Request::requestUri()); @@ -293,8 +292,7 @@ class Util { /** * Returns the script name, even if the website uses one or more reverse proxies - * - * @return the script name + * @returns string the script name */ public static function getScriptName() { return(\OC_Request::scriptName()); @@ -350,7 +348,7 @@ class Util { * Emits a signal. To get data from the slot use references! * @param string $signalclass class name of emitter * @param string $signalname name of signal - * @param string $params defautl: array() array with additional data + * @param array $params default: array() array with additional data * @return bool true if slots exists or false if not * * TODO: write example @@ -467,9 +465,8 @@ class Util { /** * Calculate free space left within user quota - * - * @param $dir the current folder where the user currently operates - * @return number of bytes representing + * @param string $dir the current folder where the user currently operates + * @return int number of bytes representing */ public static function freeSpace($dir) { return \OC_Helper::freeSpace($dir); diff --git a/settings/admin.php b/settings/admin.php index e75ca940ae6..bce18b7cf6a 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -14,7 +14,7 @@ OC_App::setActiveNavigationEntry( "admin" ); $tmpl = new OC_Template( 'settings', 'admin', 'user'); $forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::isHtAccessWorking(); +$htaccessworking=OC_Util::isHtaccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php index c25148cdde5..2b2f256b39f 100644 --- a/settings/js/apps-custom.php +++ b/settings/js/apps-custom.php @@ -9,8 +9,8 @@ // Check if admin user OC_Util::checkAdminUser(); -// Set the content type to JSON -header('Content-type: application/json'); +// Set the content type to JS +header('Content-type: application/javascript'); // Disallow caching header("Cache-Control: no-cache, must-revalidate"); diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php index 81300ed5636..b86d7d88bf9 100644 --- a/settings/l10n/ast.php +++ b/settings/l10n/ast.php @@ -6,6 +6,7 @@ $TRANSLATIONS = array( "Error" => "Fallu", "Groups" => "Grupos", "Delete" => "Desaniciar", +"Port" => "Puertu", "More" => "Más", "Less" => "Menos", "Password" => "Contraseña", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 0b6ee6a2983..8655fa05c7c 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -95,26 +95,26 @@ $TRANSLATIONS = array( "Cron" => "Cron", "Last cron was executed at %s." => "Η τελευταία εκτέλεση του cron ήταν στις %s", "Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.", -"Cron was not executed yet!" => "Η διεργασία cron δεν εκτελέστηκε ακόμα!", -"Execute one task with each page loaded" => "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται", +"Cron was not executed yet!" => "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!", +"Execute one task with each page loaded" => "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.", "Use systems cron service to call the cron.php file every 15 minutes." => "Χρήση της υπηρεσίας cron του συστήματος για να καλεστεί το αρχείο cron.php κάθε 15 λεπτά.", "Sharing" => "Διαμοιρασμός", -"Enable Share API" => "Ενεργοποίηση API Διαμοιρασμού", -"Allow apps to use the Share API" => "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού", -"Allow links" => "Να επιτρέπονται σύνδεσμοι", -"Allow users to share items to the public with links" => "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους", -"Allow public uploads" => "Επιτρέψτε κοινόχρηστο ανέβασμα", -"Allow users to enable others to upload into their publicly shared folders" => "Επιτρέψτε στους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους", -"Allow resharing" => "Να επιτρέπεται ο επαναδιαμοιρασμός", -"Allow users to share items shared with them again" => "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί", -"Allow users to share with anyone" => "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε", -"Allow users to only share with users in their groups" => "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας", -"Allow mail notification" => "Επιτρέψτε ειδοποιήσεις ηλεκτρονικού ταχυδρομείου", -"Allow user to send mail notification for shared files" => "Επιτρέψτε στο χρήστη να στέλνει ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία", +"Enable Share API" => "Ενεργοποίηση API διαμοιρασμού", +"Allow apps to use the Share API" => "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ", +"Allow links" => "Επιτρέπονται οι σύνδεσμοι", +"Allow users to share items to the public with links" => "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους", +"Allow public uploads" => "Επιτρέπεται το κοινόχρηστο ανέβασμα", +"Allow users to enable others to upload into their publicly shared folders" => "Επιτρέπει τους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους", +"Allow resharing" => "Επιτρέπεται ο επαναδιαμοιρασμός", +"Allow users to share items shared with them again" => "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί", +"Allow users to share with anyone" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε", +"Allow users to only share with users in their groups" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας", +"Allow mail notification" => "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου", +"Allow user to send mail notification for shared files" => "Επιτρέπει τους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία", "Security" => "Ασφάλεια", "Enforce HTTPS" => "Επιβολή χρήσης HTTPS", -"Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους δέκτες να συνδέονται με το %s μέσω κρυπογραφημένης σύνδεσης.", +"Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.", "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.", "Email Server" => "Διακομιστής Email", "This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index fa163ed137d..4fdd08b2c4a 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -4,7 +4,7 @@ $TRANSLATIONS = array( "Saved" => "Kaydedildi", "test email settings" => "e-posta ayarlarını sına", "If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.", -"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin.", +"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın.", "Email sent" => "E-posta gönderildi", "You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.", "Send mode" => "Gönderme kipi", diff --git a/status.php b/status.php index 861eaed9cd2..4e423560aa7 100644 --- a/status.php +++ b/status.php @@ -34,7 +34,7 @@ try { if (OC::$CLI) { print_r($values); } else { - echo(json_encode($values)); + print_unescaped(json_encode($values)); } } catch (Exception $ex) { diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php index 64fe7992b6a..b305c63ad4d 100644 --- a/tests/lib/appframework/http/DownloadResponseTest.php +++ b/tests/lib/appframework/http/DownloadResponseTest.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; //require_once(__DIR__ . "/../classloader.php"); diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php index f82d0c3a675..f62b420f4ee 100644 --- a/tests/lib/appframework/http/RedirectResponseTest.php +++ b/tests/lib/appframework/http/RedirectResponseTest.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; use OCP\AppFramework\Http; diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index 63c48a62829..19e8a68c388 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -26,7 +26,7 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; use OC\AppFramework\Http\Request; -use OC\AppFramework\Http\RedirectResponse; +use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\JSONResponse; diff --git a/version.php b/version.php index 5e5fa22cf8b..079af525454 100644 --- a/version.php +++ b/version.php @@ -1,6 +1,8 @@ <?php -// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number. +// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades +// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel +// when updating major/minor version number. $OC_Version=array(6, 90, 0, 2); // The human readable string |