diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/command/db/generatechangescript.php | 45 | ||||
| -rw-r--r-- | core/css/styles.css | 9 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 2 | ||||
| -rw-r--r-- | core/js/share.js | 116 | ||||
| -rw-r--r-- | core/l10n/fr.php | 11 | ||||
| -rw-r--r-- | core/l10n/hu_HU.php | 31 | ||||
| -rw-r--r-- | core/l10n/it.php | 13 | ||||
| -rw-r--r-- | core/l10n/ja_JP.php | 6 | ||||
| -rw-r--r-- | core/l10n/nl.php | 11 | ||||
| -rw-r--r-- | core/l10n/pt_PT.php | 5 | ||||
| -rw-r--r-- | core/l10n/ru_RU.php | 18 | ||||
| -rw-r--r-- | core/l10n/sk_SK.php | 36 | ||||
| -rw-r--r-- | core/l10n/sv.php | 2 | ||||
| -rw-r--r-- | core/register_command.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 7 |
15 files changed, 260 insertions, 54 deletions
diff --git a/core/command/db/generatechangescript.php b/core/command/db/generatechangescript.php new file mode 100644 index 00000000000..f971124cfdc --- /dev/null +++ b/core/command/db/generatechangescript.php @@ -0,0 +1,45 @@ +<?php +/** + * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\Command\Db; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; + +class GenerateChangeScript extends Command { + protected function configure() { + $this + ->setName('db:generate-change-script') + ->setDescription('generates the change script from the current connected db to db_structure.xml') + ->addArgument( + 'schema-xml', + InputArgument::OPTIONAL, + 'the schema xml to be used as target schema', + \OC::$SERVERROOT . '/db_structure.xml' + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) { + + $file = $input->getArgument('schema-xml'); + + $schemaManager = new \OC\DB\MDB2SchemaManager(\OC_DB::getConnection()); + + try { + $result = $schemaManager->updateDbFromStructure($file, true); + $output->writeln($result); + } catch (\Exception $e) { + $output->writeln('Failed to update database structure ('.$e.')'); + } + + } +} diff --git a/core/css/styles.css b/core/css/styles.css index b919660779e..62ee0e56cae 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -58,7 +58,9 @@ button, .button, } input[type="hidden"] { height:0; width:0; } input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea { - background:#f8f8f8; color:#555; cursor:text; + background: #fff; + color: #555; + cursor: text; font-family: inherit; /* use default ownCloud font instead of default textarea monospace */ } input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"] { @@ -72,7 +74,7 @@ input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:act input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active, input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active, textarea:hover, textarea:focus, textarea:active { - background-color:#fff; color:#333; + color: #333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } @@ -798,7 +800,8 @@ div.crumb { background: url('../img/breadcrumb.svg') no-repeat right center; height: 44px; } -div.crumb a { +div.crumb a, +div.crumb span { position: relative; top: 12px; padding: 14px 24px 14px 17px; diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index e5e9f6dbb7d..a9b40918ca7 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -234,7 +234,7 @@ var OCdialogs = { var getCroppedPreview = function(file) { var deferred = new $.Deferred(); // Only process image files. - var type = file.type.split('/').shift(); + var type = file.type && file.type.split('/').shift(); if (window.FileReader && type === 'image') { var reader = new FileReader(); reader.onload = function (e) { diff --git a/core/js/share.js b/core/js/share.js index b472797b3cd..6ec15f01c1e 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -4,57 +4,76 @@ OC.Share={ SHARE_TYPE_LINK:3, SHARE_TYPE_EMAIL:4, itemShares:[], - statuses:[], + statuses:{}, droppedDown:false, + /** + * Loads ALL share statuses from server, stores them in OC.Share.statuses then + * calls OC.Share.updateIcons() to update the files "Share" icon to "Shared" + * according to their share status and share type. + */ loadIcons:function(itemType) { // Load all share icons $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) { if (result && result.status === 'success') { + OC.Share.statuses = {}; $.each(result.data, function(item, data) { OC.Share.statuses[item] = data; - var hasLink = data['link']; - // Links override shared in terms of icon display - if (hasLink) { - var image = OC.imagePath('core', 'actions/public'); - } else { - var image = OC.imagePath('core', 'actions/shared'); - } - if (itemType != 'file' && itemType != 'folder') { - $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); - } else { - var file = $('tr[data-id="'+item+'"]'); - if (file.length > 0) { - var action = $(file).find('.fileactions .action[data-action="Share"]'); - var img = action.find('img').attr('src', image); - action.addClass('permanent'); - action.html(' '+t('core', 'Shared')).prepend(img); - } else { - var dir = $('#dir').val(); - if (dir.length > 1) { - var last = ''; - var path = dir; - // Search for possible parent folders that are shared - while (path != last) { - if (path == data['path']) { - var actions = $('.fileactions .action[data-action="Share"]'); - $.each(actions, function(index, action) { - var img = $(action).find('img'); - if (img.attr('src') != OC.imagePath('core', 'actions/public')) { - img.attr('src', image); - $(action).addClass('permanent'); - $(action).html(' '+t('core', 'Shared')).prepend(img); - } - }); + }); + OC.Share.updateIcons(itemType); + } + }); + }, + /** + * Updates the files' "Share" icons according to the known + * sharing states stored in OC.Share.statuses. + * (not reloaded from server) + */ + updateIcons:function(itemType){ + var item; + for (item in OC.Share.statuses){ + var data = OC.Share.statuses[item]; + + var hasLink = data['link']; + // Links override shared in terms of icon display + if (hasLink) { + var image = OC.imagePath('core', 'actions/public'); + } else { + var image = OC.imagePath('core', 'actions/shared'); + } + if (itemType != 'file' && itemType != 'folder') { + $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); + } else { + var file = $('tr[data-id="'+item+'"]'); + if (file.length > 0) { + var action = $(file).find('.fileactions .action[data-action="Share"]'); + var img = action.find('img').attr('src', image); + action.addClass('permanent'); + action.html(' '+t('core', 'Shared')).prepend(img); + } else { + var dir = $('#dir').val(); + if (dir.length > 1) { + var last = ''; + var path = dir; + // Search for possible parent folders that are shared + while (path != last) { + if (path == data['path']) { + var actions = $('.fileactions .action[data-action="Share"]'); + $.each(actions, function(index, action) { + var img = $(action).find('img'); + if (img.attr('src') != OC.imagePath('core', 'actions/public')) { + img.attr('src', image); + $(action).addClass('permanent'); + $(action).html(' '+t('core', 'Shared')).prepend(img); } - last = path; - path = OC.Share.dirname(path); - } + }); } + last = path; + path = OC.Share.dirname(path); } } - }); + } } - }); + } }, updateIcon:function(itemType, itemSource) { var shares = false; @@ -184,7 +203,19 @@ OC.Share={ html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />'; html += '<ul id="shareWithList">'; html += '</ul>'; - if (link) { + var linksAllowed = false; + $.ajax({ + type: 'GET', + url: OC.filePath('core', 'ajax', 'appconfig.php'), + data: { action:'getValue', app:'core', key:'shareapi_allow_links', defaultValue:'yes' }, + async: false, + success: function(result) { + if (result && result.status === 'success' && result.data === 'yes') { + linksAllowed = true; + } + } + }); + if (link && linksAllowed) { html += '<div id="link">'; html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>'; html += '<br />'; @@ -262,7 +293,7 @@ OC.Share={ // Default permissions are Edit (CRUD) and Share var permissions = OC.PERMISSION_ALL; OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() { - OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions); + OC.Share.addShareWith(shareType, shareWith, selected.item.value.shareWith, permissions, possiblePermissions); $('#shareWith').val(''); OC.Share.updateIcon(itemType, itemSource); }); @@ -303,6 +334,9 @@ OC.Share={ }); }, addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) { + if (shareType === 1) { + shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')'; + } if (!OC.Share.itemShares[shareType]) { OC.Share.itemShares[shareType] = []; } diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 82b93172a1e..7eff85ce6a6 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -96,8 +96,12 @@ $TRANSLATIONS = array( "Email sent" => "Email envoyé", "Warning" => "Attention", "The object type is not specified." => "Le type d'objet n'est pas spécifié.", +"Enter new" => "Saisir un nouveau", "Delete" => "Supprimer", "Add" => "Ajouter", +"Edit tags" => "Modifier les balises", +"Error loading dialog template: {error}" => "Erreur de chargement du modèle de dialogue : {error}", +"No tags selected for deletion." => "Aucune balise sélectionnée pour la suppression.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", "%s password reset" => "Réinitialisation de votre mot de passe %s", @@ -118,6 +122,13 @@ $TRANSLATIONS = array( "Apps" => "Applications", "Admin" => "Administration", "Help" => "Aide", +"Error loading tags" => "Erreur de chargement des balises.", +"Tag already exists" => "La balise existe déjà.", +"Error deleting tag(s)" => "Erreur de suppression de(s) balise(s)", +"Error tagging" => "Erreur lors de la mise en place de la balise", +"Error untagging" => "Erreur lors de la suppression de la balise", +"Error favoriting" => "Erreur lors de la mise en favori", +"Error unfavoriting" => "Erreur lors de la suppression des favoris", "Access forbidden" => "Accès interdit", "Cloud not found" => "Introuvable", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nJuste pour vous signaler que %s a partagé %s avec vous.\nConsultez-le : %s\n", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index f2d9d1ba22a..4985edf0378 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«", +"Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s", "group" => "csoport", "Turned on maintenance mode" => "A karbantartási mód bekapcsolva", "Turned off maintenance mode" => "A karbantartási mód kikapcsolva", @@ -34,13 +35,13 @@ $TRANSLATIONS = array( "December" => "december", "Settings" => "Beállítások", "seconds ago" => "pár másodperce", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("%n perccel ezelőtt","%n perccel ezelőtt"), +"_%n hour ago_::_%n hours ago_" => array("%n órával ezelőtt","%n órával ezelőtt"), "today" => "ma", "yesterday" => "tegnap", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("%n nappal ezelőtt","%n nappal ezelőtt"), "last month" => "múlt hónapban", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"), "months ago" => "több hónapja", "last year" => "tavaly", "years ago" => "több éve", @@ -50,7 +51,7 @@ $TRANSLATIONS = array( "No" => "Nem", "Ok" => "Ok", "Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"), "One file conflict" => "Egy file ütközik", "Which files do you want to keep?" => "Melyik file-okat akarod megtartani?", "If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.", @@ -81,6 +82,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal", "Shared in {item} with {user}" => "Megosztva {item}-ben {user}-rel", "Unshare" => "A megosztás visszavonása", +"notify user by email" => "felhasználó értesítése e-mailben", "can edit" => "módosíthat", "access control" => "jogosultság", "create" => "létrehoz", @@ -94,8 +96,12 @@ $TRANSLATIONS = array( "Email sent" => "Az emailt elküldtük", "Warning" => "Figyelmeztetés", "The object type is not specified." => "Az objektum típusa nincs megadva.", +"Enter new" => "Új beírása", "Delete" => "Törlés", "Add" => "Hozzáadás", +"Edit tags" => "Címkék szerkesztése", +"Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}", +"No tags selected for deletion." => "Nincs törlésre kijelölt címke.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.", "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.", "%s password reset" => "%s jelszó visszaállítás", @@ -116,8 +122,18 @@ $TRANSLATIONS = array( "Apps" => "Alkalmazások", "Admin" => "Adminsztráció", "Help" => "Súgó", +"Error loading tags" => "Hiba a címkék betöltésekor", +"Tag already exists" => "A címke már létezik", +"Error deleting tag(s)" => "Hiba a címkék törlésekor", +"Error tagging" => "Hiba a címkézéskor", +"Error untagging" => "Hiba a címkék eltávolításakor", +"Error favoriting" => "Hiba a kedvencekhez adáskor", +"Error unfavoriting" => "Hiba a kedvencekből törléskor", "Access forbidden" => "A hozzáférés nem engedélyezett", "Cloud not found" => "A felhő nem található", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n", +"The share will expire on %s.\n\n" => "A megosztás ekkor jár le: %s\\n\n\\n", +"Cheers!" => "Üdv.", "Security Warning" => "Biztonsági figyelmeztetés", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.", @@ -136,15 +152,20 @@ $TRANSLATIONS = array( "Database tablespace" => "Az adatbázis táblázattér (tablespace)", "Database host" => "Adatbázis szerver", "Finish setup" => "A beállítások befejezése", +"Finishing …" => "Befejezés ...", "%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.", "Log out" => "Kilépés", "Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!", "If you did not change your password recently, your account may be compromised!" => "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy idegenek jutottak be a rendszerbe az Ön nevében!", "Please change your password to secure your account again." => "A biztonsága érdekében változtassa meg a jelszavát!", +"Server side authentication failed!" => "A szerveroldali hitelesítés sikertelen!", +"Please contact your administrator." => "Kérjük, lépjen kapcsolatba a rendszergazdával.", "Lost your password?" => "Elfelejtette a jelszavát?", "remember" => "emlékezzen", "Log in" => "Bejelentkezés", "Alternative Logins" => "Alternatív bejelentkezés", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>", +"The share will expire on %s.<br><br>" => "A megosztás ekkor jár le: %s<br><br>", "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/it.php b/core/l10n/it.php index 1cb1a39c743..dead0fab87c 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -96,8 +96,12 @@ $TRANSLATIONS = array( "Email sent" => "Messaggio inviato", "Warning" => "Avviso", "The object type is not specified." => "Il tipo di oggetto non è specificato.", +"Enter new" => "Inserisci nuovo", "Delete" => "Elimina", "Add" => "Aggiungi", +"Edit tags" => "Modifica etichette", +"Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}", +"No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.", "%s password reset" => "Ripristino password di %s", @@ -118,6 +122,13 @@ $TRANSLATIONS = array( "Apps" => "Applicazioni", "Admin" => "Admin", "Help" => "Aiuto", +"Error loading tags" => "Errore di caricamento delle etichette", +"Tag already exists" => "L'etichetta esiste già", +"Error deleting tag(s)" => "Errore di eliminazione delle etichette", +"Error tagging" => "Errore di assegnazione delle etichette", +"Error untagging" => "Errore di rimozione delle etichette", +"Error favoriting" => "Errore di creazione dei preferiti", +"Error unfavoriting" => "Errore di rimozione dai preferiti", "Access forbidden" => "Accesso negato", "Cloud not found" => "Nuvola non trovata", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n", @@ -147,6 +158,8 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Accesso automatico rifiutato.", "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.", "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.", +"Server side authentication failed!" => "Autenticazione lato server non riuscita!", +"Please contact your administrator." => "Contatta il tuo amministratore di sistema.", "Lost your password?" => "Hai perso la password?", "remember" => "ricorda", "Log in" => "Accedi", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index b0c519e3a1c..469d75e229e 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -100,6 +100,7 @@ $TRANSLATIONS = array( "Delete" => "削除", "Add" => "追加", "Edit tags" => "タグを編集", +"Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", "No tags selected for deletion." => "削除するタグが選択されていません。", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。", "The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。", @@ -126,9 +127,13 @@ $TRANSLATIONS = array( "Error deleting tag(s)" => "タグの削除エラー", "Error tagging" => "タグの付与エラー", "Error untagging" => "タグの解除エラー", +"Error favoriting" => "お気に入りに追加エラー", +"Error unfavoriting" => "お気に入りから削除エラー", "Access forbidden" => "アクセスが禁止されています", "Cloud not found" => "見つかりません", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n", "The share will expire on %s.\n\n" => "共有は %s で有効期限が切れます。\n\n", +"Cheers!" => "それでは！", "Security Warning" => "セキュリティ警告", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。", "Please update your PHP installation to use %s securely." => "%s を安全に利用する為に インストールされているPHPをアップデートしてください。", @@ -159,6 +164,7 @@ $TRANSLATIONS = array( "remember" => "パスワードを記憶する", "Log in" => "ログイン", "Alternative Logins" => "代替ログイン", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>", "The share will expire on %s.<br><br>" => "共有は %s で有効期限が切れます。<br><br>", "Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。" ); diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 675471f88e0..5e99d831132 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -96,8 +96,12 @@ $TRANSLATIONS = array( "Email sent" => "E-mail verzonden", "Warning" => "Waarschuwing", "The object type is not specified." => "Het object type is niet gespecificeerd.", +"Enter new" => "Opgeven nieuw", "Delete" => "Verwijder", "Add" => "Toevoegen", +"Edit tags" => "Bewerken tags", +"Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}", +"No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.", "%s password reset" => "%s wachtwoord reset", @@ -118,6 +122,13 @@ $TRANSLATIONS = array( "Apps" => "Apps", "Admin" => "Beheerder", "Help" => "Help", +"Error loading tags" => "Fout bij laden tags", +"Tag already exists" => "Tag bestaat al", +"Error deleting tag(s)" => "Fout bij verwijderen tag(s)", +"Error tagging" => "Fout bij taggen", +"Error untagging" => "Fout bij ont-taggen", +"Error favoriting" => "Fout bij favoriet maken", +"Error unfavoriting" => "Fout bij verwijderen favorietstatus", "Access forbidden" => "Toegang verboden", "Cloud not found" => "Cloud niet gevonden", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index c14cb718749..b9c1d59c91f 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -50,6 +50,9 @@ $TRANSLATIONS = array( "Error loading message template: {error}" => "Erro ao carregar o template: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("",""), "Cancel" => "Cancelar", +"Continue" => "Continuar", +"(all selected)" => "(todos seleccionados)", +"({count} selected)" => "({count} seleccionados)", "Shared" => "Partilhado", "Share" => "Partilhar", "Error" => "Erro", @@ -72,6 +75,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Não é permitido partilhar de novo", "Shared in {item} with {user}" => "Partilhado em {item} com {user}", "Unshare" => "Deixar de partilhar", +"notify user by email" => "notificar utilizador por correio electrónico", "can edit" => "pode editar", "access control" => "Controlo de acesso", "create" => "criar", @@ -127,6 +131,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Tablespace da base de dados", "Database host" => "Anfitrião da base de dados", "Finish setup" => "Acabar instalação", +"Finishing …" => "A terminar...", "%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.", "Log out" => "Sair", "Automatic logon rejected!" => "Login automático rejeitado!", diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php new file mode 100644 index 00000000000..8a82c09c5b1 --- /dev/null +++ b/core/l10n/ru_RU.php @@ -0,0 +1,18 @@ +<?php +$TRANSLATIONS = array( +"Settings" => "Настройки", +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n day ago_::_%n days ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("","",""), +"Yes" => "Да", +"No" => "Нет", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Отмена", +"Share" => "Сделать общим", +"Error" => "Ошибка", +"Password" => "Пароль", +"Warning" => "Предупреждение", +"Username" => "Имя пользователя" +); +$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index db29395a7f6..5aa9b56ec07 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s s Vami zdieľa »%s«", +"Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ", "group" => "skupina", "Turned on maintenance mode" => "Mód údržby zapnutý", "Turned off maintenance mode" => "Mód údržby vypnutý", @@ -8,6 +9,11 @@ $TRANSLATIONS = array( "Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...", "Updated filecache" => "\"Filecache\" aktualizovaná", "... %d%% done ..." => "... %d%% dokončených ...", +"No image or file provided" => "Obrázok alebo súbor nebol zadaný", +"Unknown filetype" => "Neznámy typ súboru", +"Invalid image" => "Chybný obrázok", +"No temporary profile picture available, try again" => "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu", +"No crop data provided" => "Dáta pre orezanie neboli zadané", "Sunday" => "Nedeľa", "Monday" => "Pondelok", "Tuesday" => "Utorok", @@ -40,11 +46,19 @@ $TRANSLATIONS = array( "last year" => "minulý rok", "years ago" => "pred rokmi", "Choose" => "Výber", +"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}", "Yes" => "Áno", "No" => "Nie", "Ok" => "Ok", -"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"), +"One file conflict" => "Jeden konflikt súboru", +"Which files do you want to keep?" => "Ktoré súbory chcete ponechať?", +"If you select both versions, the copied file will have a number added to its name." => "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.", "Cancel" => "Zrušiť", +"Continue" => "Pokračovať", +"(all selected)" => "(všetko vybrané)", +"({count} selected)" => "({count} vybraných)", "Shared" => "Zdieľané", "Share" => "Zdieľať", "Error" => "Chyba", @@ -67,6 +81,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Zdieľanie už zdieľanej položky nie je povolené", "Shared in {item} with {user}" => "Zdieľané v {item} s {user}", "Unshare" => "Zrušiť zdieľanie", +"notify user by email" => "upozorniť používateľa emailom", "can edit" => "môže upraviť", "access control" => "prístupové práva", "create" => "vytvoriť", @@ -80,8 +95,12 @@ $TRANSLATIONS = array( "Email sent" => "Email odoslaný", "Warning" => "Varovanie", "The object type is not specified." => "Nešpecifikovaný typ objektu.", +"Enter new" => "Zadať nový", "Delete" => "Zmazať", "Add" => "Pridať", +"Edit tags" => "Upraviť štítky", +"Error loading dialog template: {error}" => "Chyba pri načítaní šablóny dialógu: {error}", +"No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.", "%s password reset" => "reset hesla %s", @@ -102,8 +121,18 @@ $TRANSLATIONS = array( "Apps" => "Aplikácie", "Admin" => "Administrátor", "Help" => "Pomoc", +"Error loading tags" => "Chyba pri načítaní štítkov", +"Tag already exists" => "Štítok už existuje", +"Error deleting tag(s)" => "Chyba pri mazaní štítka(ov)", +"Error tagging" => "Chyba pri pridaní štítka", +"Error untagging" => "Chyba pri odobratí štítka", +"Error favoriting" => "Chyba pri pridaní do obľúbených", +"Error unfavoriting" => "Chyba pri odobratí z obľúbených", "Access forbidden" => "Prístup odmietnutý", "Cloud not found" => "Nenájdené", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ahoj,\n\nchcem ti dať navedomie, že %s zdieľa %s s tebou.\nZobrazenie tu: %s\n\n", +"The share will expire on %s.\n\n" => "Zdieľanie vyexpiruje %s.\n\n", +"Cheers!" => "Za zdravie!", "Security Warning" => "Bezpečnostné varovanie", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.", @@ -122,15 +151,20 @@ $TRANSLATIONS = array( "Database tablespace" => "Tabuľkový priestor databázy", "Database host" => "Server databázy", "Finish setup" => "Dokončiť inštaláciu", +"Finishing …" => "Dokončujem...", "%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.", "Log out" => "Odhlásiť", "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!", "If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.", "Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu", +"Server side authentication failed!" => "Autentifikácia na serveri zlyhala!", +"Please contact your administrator." => "Kontaktujte prosím vášho administrátora.", "Lost your password?" => "Zabudli ste heslo?", "remember" => "zapamätať", "Log in" => "Prihlásiť sa", "Alternative Logins" => "Alternatívne prihlasovanie", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ahoj,<br><br>chcem ti dať navedomie, že %s zdieľa »%s« s tebou.<br><a href=\"%s\">Zobrazenie tu!</a><br><br>", +"The share will expire on %s.<br><br>" => "Zdieľanie vyexpiruje %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 239b9495ef3..e89ab9d85e8 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -96,6 +96,7 @@ $TRANSLATIONS = array( "Email sent" => "E-post skickat", "Warning" => "Varning", "The object type is not specified." => "Objekttypen är inte specificerad.", +"Enter new" => "Skriv nytt", "Delete" => "Radera", "Add" => "Lägg till", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", @@ -118,6 +119,7 @@ $TRANSLATIONS = array( "Apps" => "Program", "Admin" => "Admin", "Help" => "Hjälp", +"Error favoriting" => "Fel favorisering", "Access forbidden" => "Åtkomst förbjuden", "Cloud not found" => "Hittade inget moln", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\n", diff --git a/core/register_command.php b/core/register_command.php index 1eed347b7b5..683e7ae1833 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -6,4 +6,6 @@ * See the COPYING-README file. */ +/** @var $application Symfony\Component\Console\Application */ $application->add(new OC\Core\Command\Status); +$application->add(new OC\Core\Command\Db\GenerateChangeScript()); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d30313a67cc..9e1d8022ecb 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -8,9 +8,10 @@ <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> - <?php p(!empty($_['application'])?$_['application'].' | ':''); - p($theme->getTitle()); - p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> + <?php + p(!empty($_['application'])?$_['application'].' - ':''); + p($theme->getTitle()); + ?> </title> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |