diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/js/js.js | 2 | ||||
-rw-r--r-- | core/js/tests/specs/coreSpec.js | 3 | ||||
-rw-r--r-- | core/l10n/cs_CZ.js | 3 | ||||
-rw-r--r-- | core/l10n/cs_CZ.json | 3 | ||||
-rw-r--r-- | core/l10n/el.js | 3 | ||||
-rw-r--r-- | core/l10n/el.json | 3 | ||||
-rw-r--r-- | core/l10n/pt_PT.js | 3 | ||||
-rw-r--r-- | core/l10n/pt_PT.json | 3 | ||||
-rw-r--r-- | core/l10n/zh_TW.js | 3 | ||||
-rw-r--r-- | core/l10n/zh_TW.json | 3 | ||||
-rw-r--r-- | core/templates/layout.user.php | 2 |
11 files changed, 21 insertions, 10 deletions
diff --git a/core/js/js.js b/core/js/js.js index a3efb64e4bd..460f65256a9 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1295,7 +1295,7 @@ function initCore() { */ function setupMainMenu() { // toggle the navigation - var $toggle = $('#header .menutoggle'); + var $toggle = $('#header .header-appname-container'); var $navigation = $('#navigation'); // init the menu diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 3ebe55305f7..f653fc88637 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -458,12 +458,11 @@ describe('Core base tests', function() { var clock; var $toggle; var $navigation; - var clock; beforeEach(function() { clock = sinon.useFakeTimers(); $('#testArea').append('<div id="header">' + - '<a class="menutoggle" href="#">' + + '<a class="menutoggle header-appname-container" href="#">' + '<h1 class="header-appname"></h1>' + '<div class="icon-caret"></div>' + '</a>' + diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index f6a0c9d43b1..a1680a1dea3 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -250,6 +250,7 @@ OC.L10N.register( "Finishing …" : "Dokončuji...", "Need help?" : "Potřebujete pomoc?", "See the documentation" : "Shlédnout dokumentaci", + "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>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.", "Log out" : "Odhlásit se", "Search" : "Hledat", @@ -259,8 +260,8 @@ OC.L10N.register( "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", + "Stay logged in" : "Neodhlašovat", "Alternative Logins" : "Alternativní přihlášení", - "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>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>", "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.", "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 30776da294a..bff75145c2c 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -248,6 +248,7 @@ "Finishing …" : "Dokončuji...", "Need help?" : "Potřebujete pomoc?", "See the documentation" : "Shlédnout dokumentaci", + "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>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.", "Log out" : "Odhlásit se", "Search" : "Hledat", @@ -257,8 +258,8 @@ "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", + "Stay logged in" : "Neodhlašovat", "Alternative Logins" : "Alternativní přihlášení", - "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>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>", "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.", "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.", diff --git a/core/l10n/el.js b/core/l10n/el.js index d6454f29708..10cbaf032ce 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -172,6 +172,7 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"], "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.", + "An error occurred." : "Παρουσιάστηκε σφάλμα", "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.", "The update was unsuccessful. " : "Η ενημέρωση ήταν ανεπιτυχής.", "The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπήρχαν προειδοποιήσεις.", @@ -244,6 +245,7 @@ OC.L10N.register( "Finishing …" : "Ολοκλήρωση...", "Need help?" : "Θέλετε βοήθεια;", "See the documentation" : "Δείτε την τεκμηρίωση", + "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>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.", "Log out" : "Αποσύνδεση", "Search" : "Αναζήτηση", @@ -254,7 +256,6 @@ OC.L10N.register( "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", "Alternative Logins" : "Εναλλακτικές Συνδέσεις", - "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>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>", "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.", "This means only administrators can use the instance." : "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.", diff --git a/core/l10n/el.json b/core/l10n/el.json index f17445c6715..d2d7e7c4676 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -170,6 +170,7 @@ "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"], "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.", + "An error occurred." : "Παρουσιάστηκε σφάλμα", "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.", "The update was unsuccessful. " : "Η ενημέρωση ήταν ανεπιτυχής.", "The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπήρχαν προειδοποιήσεις.", @@ -242,6 +243,7 @@ "Finishing …" : "Ολοκλήρωση...", "Need help?" : "Θέλετε βοήθεια;", "See the documentation" : "Δείτε την τεκμηρίωση", + "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>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.", "Log out" : "Αποσύνδεση", "Search" : "Αναζήτηση", @@ -252,7 +254,6 @@ "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", "Alternative Logins" : "Εναλλακτικές Συνδέσεις", - "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>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>", "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.", "This means only administrators can use the instance." : "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.", "Contact your system administrator if this message persists or appeared unexpectedly." : "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.", diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index 300dbda2d80..e00f09e7eff 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -148,6 +148,7 @@ OC.L10N.register( "change" : "alterar", "delete" : "apagar", "access control" : "controlo de acesso", + "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.", "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo", "Share" : "Compartilhar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud", @@ -185,6 +186,7 @@ OC.L10N.register( "New Password" : "Nova palavra-passe", "Reset password" : "Repor palavra-passe", "Searching other places" : "A pesquisar noutros lugares", + "No search results in other folders" : "Sem resultados de procura nas outras pastas", "Personal" : "Pessoal", "Users" : "Utilizadores", "Apps" : "Apps", @@ -251,6 +253,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", + "Stay logged in" : "Manter sessão iniciada", "Alternative Logins" : "Contas de acesso alternativas", "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.", "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index 4af808cb24b..b0bf92a78c8 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -146,6 +146,7 @@ "change" : "alterar", "delete" : "apagar", "access control" : "controlo de acesso", + "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.", "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo", "Share" : "Compartilhar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud", @@ -183,6 +184,7 @@ "New Password" : "Nova palavra-passe", "Reset password" : "Repor palavra-passe", "Searching other places" : "A pesquisar noutros lugares", + "No search results in other folders" : "Sem resultados de procura nas outras pastas", "Personal" : "Pessoal", "Users" : "Utilizadores", "Apps" : "Apps", @@ -249,6 +251,7 @@ "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", + "Stay logged in" : "Manter sessão iniciada", "Alternative Logins" : "Contas de acesso alternativas", "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.", "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.", diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index 86d949e1fd9..93138a93e92 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -154,6 +154,7 @@ OC.L10N.register( "change" : "更動", "delete" : "刪除", "access control" : "存取控制", + "Share details could not be loaded for this item." : "無法載入分享細節", "An error occured. Please try again" : "發生錯誤,請重試", "Share" : "分享", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享,請使用此格式 username@example.com/owncloud", @@ -250,6 +251,7 @@ OC.L10N.register( "Finishing …" : "即將完成…", "Need help?" : "需要幫助?", "See the documentation" : "閱讀說明文件", + "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>" : "嗨,<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "這個應用程式需要啟用 Javascript 才能正常運作,請{linkstart}啟用Javascript{linkend}然後重新整理頁面。", "Log out" : "登出", "Search" : "搜尋", @@ -261,7 +263,6 @@ OC.L10N.register( "Wrong password. Reset it?" : "密碼錯誤,重設密碼?", "Stay logged in" : "保持登入狀態", "Alternative Logins" : "其他登入方法", - "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>" : "嗨,<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>", "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式", "This means only administrators can use the instance." : "這表示只有系統管理員能夠使用", "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現,請聯絡系統管理員", diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index 5012626b765..ea5fdbda2d0 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -152,6 +152,7 @@ "change" : "更動", "delete" : "刪除", "access control" : "存取控制", + "Share details could not be loaded for this item." : "無法載入分享細節", "An error occured. Please try again" : "發生錯誤,請重試", "Share" : "分享", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享,請使用此格式 username@example.com/owncloud", @@ -248,6 +249,7 @@ "Finishing …" : "即將完成…", "Need help?" : "需要幫助?", "See the documentation" : "閱讀說明文件", + "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>" : "嗨,<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "這個應用程式需要啟用 Javascript 才能正常運作,請{linkstart}啟用Javascript{linkend}然後重新整理頁面。", "Log out" : "登出", "Search" : "搜尋", @@ -259,7 +261,6 @@ "Wrong password. Reset it?" : "密碼錯誤,重設密碼?", "Stay logged in" : "保持登入狀態", "Alternative Logins" : "其他登入方法", - "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>" : "嗨,<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>", "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式", "This means only administrators can use the instance." : "這表示只有系統管理員能夠使用", "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現,請聯絡系統管理員", diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4d9e3ae93d5..15e4cc9986f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -63,7 +63,7 @@ <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="settings" class="svg"> - <div id="expand" tabindex="6" role="link"> + <div id="expand" tabindex="6" role="link" class="menutoggle"> <?php if ($_['enableAvatars']): ?> <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>"> <?php if ($_['userAvatarSet']): ?> |