diff --git a/actions/apiqvittersandboxcreate.php b/actions/apiqvittersandboxcreate.php index f713e61..b4a81e7 100644 --- a/actions/apiqvittersandboxcreate.php +++ b/actions/apiqvittersandboxcreate.php @@ -86,10 +86,6 @@ class ApiQvitterSandboxCreateAction extends ApiAuthAction if (!$this->scoped->hasRight(Right::SANDBOXUSER)) { $this->clientError(_('You cannot sandbox users on this site.'), 403); } - // Only administrators can sandbox other privileged users (such as others who have the right to sandbox). - if ($this->scoped->isPrivileged() && !$this->scoped->hasRole(Profile_role::ADMINISTRATOR)) { - $this->clientError(_('You cannot sandbox other privileged users.'), 403); - } // only sandbox of the user isn't sandboxed if (!$this->other->isSandboxed()) { diff --git a/actions/qvitter.php b/actions/qvitter.php index 79f263b..895fae8 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -480,7 +480,7 @@ class QvitterAction extends ApiAction -
    • +
    • @@ -652,7 +652,9 @@ class QvitterAction extends ApiAction
    -

    +

    + +

    diff --git a/css/qvitter.css b/css/qvitter.css index 064e6d7..8c7e045 100644 --- a/css/qvitter.css +++ b/css/qvitter.css @@ -511,6 +511,9 @@ body.rtl .dropdown-menu li:not(.dropdown-caret) { white-space: nowrap; text-decoration: none; } +body.rtl .dropdown-menu li:not(.dropdown-caret) a { + padding: 3px 22px 3px 15px; + } .quitter-settings.dropdown-menu li.fullwidth:not(.dropdown-caret) a, #stream-menu-cog .dropdown-menu li.fullwidth:not(.dropdown-caret) a, .action-ellipsis-container .dropdown-menu li.fullwidth:not(.dropdown-caret) a { @@ -567,6 +570,10 @@ body.rtl .dropdown-menu li:not(.dropdown-caret) { font-size:10px; line-height: 18px; } +body.rtl .dropdown-menu .row-type-profile-prefs-toggle::before { + left:auto; + right:3px; + } .dropdown-menu .row-type-profile-prefs-toggle.disabled::before { content:' '; } @@ -1450,6 +1457,10 @@ body.rtl #history-container.menu-container a .chev-right { text-align:center; font-weight:normal; } +body.rtl #unseen-notifications { + right: auto; + left: 0; + } #history-container { display:none; @@ -1645,10 +1656,7 @@ body.rtl #history-container.menu-container a .chev-right { color: #333333; line-height: 18px; background-color: #FFFFFF; - padding-top: 12px; - padding-right: 12px; - padding-bottom: 12px; - padding-left: 12px; + padding: 8px 12px; border-bottom-width: 1px; border-bottom-color: #E8E8E8; border-bottom-style: solid; @@ -1668,7 +1676,17 @@ body.rtl #history-container.menu-container a .chev-right { color: #66757F; font-size: 22px; font-weight: 300; - line-height: 22px; + line-height: 30px; + } + +#stream-header { + display: inline-block; + max-width: 490px; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: top; + height: 30px; + white-space: nowrap; } #feed-header-description { @@ -1701,6 +1719,10 @@ body.rtl #history-container.menu-container a .chev-right { opacity: 0.6; padding: 0 5px 12px 10px; } +body.rtl .user-menu-cog { + float: left; + padding: 0 10px 12px 5px; + } .hover-card .user-menu-cog { color: #fff; display: block; @@ -1743,6 +1765,13 @@ body.rtl #history-container.menu-container a .chev-right { content:'\f070'; font-family: fontAwesome; } +body.rtl .stream-item.user.user-muted > .queet > .user-menu-cog::after, +body.rtl .profile-card.user-muted .user-menu-cog::after, +.queet.rtl .stream-item.notice.user-muted > .queet .account-group .name::after, +.queet.rtl .stream-item.notification.user-muted > .queet .account-group .name::after { + left:auto; + right:-20px; + } .hover-card .profile-card.user-muted .user-menu-cog::after { left:auto; right:-25px; @@ -2908,12 +2937,15 @@ ul.queet-actions > li .icon { ul.queet-actions > li:not(:first-child) .icon { margin-left:52px; } -.queet.rtl ul.queet-actions .icon { - margin-left:26px; +.queet.rtl ul.queet-actions > li:not(:first-child) .icon { + margin-left:7px; + margin-right:52px; } -.queet.rtl ul.queet-actions > li .icon { - margin-right:0; +.queet.rtl ul.queet-actions > li:first-child .icon { + margin-left:0; + margin-right:0; } + ul.queet-actions > li.action-rt-container .with-icn.done .icon:before { color: #609928; } @@ -3224,8 +3256,11 @@ ul.stats { .stream-item ul.stats { width: 1000px; } +.queet.rtl .queet-stats-container { + min-height:0; + } .queet.rtl ul.stats { - text-align:right; + float:right; } ul.stats li { display:block; @@ -3233,6 +3268,11 @@ ul.stats li { padding: 4px 10px 0 0; min-width:82px; box-sizing:border-box; + text-align: left; + } +.queet.rtl ul.stats li { + padding-left: 10px; + text-align: right; } .profile-card ul.stats li { padding-top: 7px; @@ -3261,10 +3301,6 @@ ul.stats a { .hover-card ul.stats a { font-size: 9px; } -.queet.rtl ul.stats a{ - border-right: 1px solid #E8E8E8; - border-left: 0 none; - } ul.stats a strong { font-size: 18px; @@ -3281,6 +3317,10 @@ ul.stats .avatar-row { border-left: 1px solid #E8E8E8; padding: 12px; } +.queet.rtl ul.stats .avatar-row { + border-left:0 none; + border-right: 1px solid #E8E8E8; + } ul.stats .avatar-row a { padding: 11px 0; border-left: medium none; @@ -3292,18 +3332,12 @@ ul.stats .avatar-row a { border-left: 0 none; padding-left: 0; } -.queet.rtl ul.stats .avatar-row a:last-child { - border-right: 1px solid #E8E8E8; - padding-right: 12px; - border-left: 0 none; - padding-left: 0; - } ul.stats .avatar-row .avatar { float: left; margin-right: 5px; } .queet.rtl ul.stats .avatar-row .avatar { - float: left; + float: right; margin-left: 5px; margin-right: 0; } @@ -4577,6 +4611,10 @@ button.shorten:after { margin-left:0; opacity:0.5; } +body.rtl #feed-header-inner .loader { + left:2px; + right:auto; + } .reload-stream { display: block; @@ -5463,10 +5501,18 @@ body.rtl .language-dropdown { body.rtl .quitter-settings.dropdown-menu { left:auto; right:50%; - margin-right:147px; + margin-right:22px; margin-left:0; } +/* hide these since I just can't get syntax highlighting working properly in rtl... */ +body.rtl .syntax-middle .mention, +body.rtl .syntax-middle .tag, +body.rtl .syntax-middle .group, +body.rtl .syntax-middle .externalMention { + opacity:0; + } + body.rtl #logo { left:auto; right:50%; diff --git a/img/some-svgs/jumping-gnu.svg b/img/some-svgs/jumping-gnu.svg new file mode 100644 index 0000000..b62c443 --- /dev/null +++ b/img/some-svgs/jumping-gnu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-avatar.svg b/img/some-svgs/quitter-avatar.svg new file mode 100644 index 0000000..20d37e4 --- /dev/null +++ b/img/some-svgs/quitter-avatar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-new-birds.svg b/img/some-svgs/quitter-new-birds.svg new file mode 100644 index 0000000..d3ccfde --- /dev/null +++ b/img/some-svgs/quitter-new-birds.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-old-birds-bw.svg b/img/some-svgs/quitter-old-birds-bw.svg new file mode 100644 index 0000000..df9cabd --- /dev/null +++ b/img/some-svgs/quitter-old-birds-bw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-old-birds-color.svg b/img/some-svgs/quitter-old-birds-color.svg new file mode 100644 index 0000000..4a37538 --- /dev/null +++ b/img/some-svgs/quitter-old-birds-color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-old-birds-favicon.svg b/img/some-svgs/quitter-old-birds-favicon.svg new file mode 100644 index 0000000..fc4f72c --- /dev/null +++ b/img/some-svgs/quitter-old-birds-favicon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-old.svg b/img/some-svgs/quitter-old.svg new file mode 100644 index 0000000..13cccc5 --- /dev/null +++ b/img/some-svgs/quitter-old.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/some-svgs/quitter-text.svg b/img/some-svgs/quitter-text.svg new file mode 100644 index 0000000..f6d64ad --- /dev/null +++ b/img/some-svgs/quitter-text.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/dom-functions.js b/js/dom-functions.js index 8ad09e6..b1c2843 100644 --- a/js/dom-functions.js +++ b/js/dom-functions.js @@ -220,7 +220,7 @@ function showFavsAndRequeetsInQueet(q,data) { q.children('.queet').find('ul.stats').remove(); } - q.children('.queet').find('.queet-stats-container').prepend(''); + q.children('.queet').find('.queet-stats-container').prepend('
    '); // set the expanded fav-count number if(data.favs.length > 0) { @@ -755,6 +755,9 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess $('#new-queets-bar-container').addClass('hidden'); $('.reload-stream').hide(); + // remove old menu cog + $('#stream-menu-cog').remove(); + display_spinner('#feed-header-inner'); // are we just reloading? @@ -773,10 +776,10 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess // set the new streams header and description if(streamObject.streamSubHeader) { - $('#feed-header-inner h2').html(streamObject.streamSubHeader); + $('#stream-header').html(streamObject.streamSubHeader); } else { - $('#feed-header-inner h2').html(streamObject.streamHeader); + $('#stream-header').html(streamObject.streamHeader); } if(streamObject.streamDescription !== false) { $('#feed-header-description').html(streamObject.streamDescription); @@ -1926,7 +1929,7 @@ function addToFeed(feed, after, extraClasses) { // if repeat-notice doesn't already exist in feed if($('#stream-item-' + obj.id).length == 0) { - // if the repeated notice already exist in feed, we add this, but hidden + // if the this or the repeated notice already exist in feed, we add this, but hidden if($('.stream-item[data-quitter-id="' + obj.retweeted_status.id + '"]').length > 0) { extraClassesThisRun += ' hidden-repeat'; } @@ -1949,6 +1952,14 @@ function addToFeed(feed, after, extraClasses) { // only if not already exist if($('#stream-item-' + obj.id).length == 0) { + // sometimes the notice already exist but in the form of a repeat, because of + // a repeat reaching our server before the actual notice, or because of date settings + // on different servers, anyhow, hide this notice if a repeat of it already exist in + // the stream, using the hidden-repeat class (a little confusing maybe) + if($('.stream-item[data-quitter-id="' + obj.id + '"]').length > 0) { + extraClassesThisRun += ' hidden-repeat'; + } + // remove any matching temp post if(typeof obj.user != 'undefined' && obj.user.id == window.loggedIn.id diff --git a/js/qvitter.js b/js/qvitter.js index 17e752f..20a6cec 100644 --- a/js/qvitter.js +++ b/js/qvitter.js @@ -927,7 +927,7 @@ function proceedToSetLanguageAndLogin(data){ $('#queet-box').html(window.sL.compose); $('#queet-box').attr('data-start-text',encodeURIComponent(window.sL.compose)); $('#user-footer .queet-button button').html(window.sL.queetVerb); - $('#feed-header-inner h2').html(window.sL.queetsNounPlural); + $('#stream-header').html(window.sL.queetsNounPlural); $('#logout').html(window.sL.logout); $('#settings').html(window.sL.settings); $('#other-servers-link').html(window.sL.otherServers); @@ -2169,7 +2169,7 @@ $('body').on('click','.stream-item .queet img.attachment-thumb',function (event) var thisAttachmentThumbSrc = $(this).attr('src'); var parentStreamItem = $(this).closest('.stream-item'); var $parentStreamItemClone = $('
    ').append(parentStreamItem.outerHTML()); - var $queetThumbsClone = $('
    ').append($parentStreamItemClone.find('.queet-thumbs').outerHTML()); + var $queetThumbsClone = $('
    ').append($parentStreamItemClone.children('.stream-item').children('.queet').find('.queet-thumbs').outerHTML()); // cleaned version of the stream item to show in the footer cleanStreamItemsFromClassesAndConversationElements($parentStreamItemClone); diff --git a/locale/ar.json b/locale/ar.json index 1255bab..38b49ea 100644 --- a/locale/ar.json +++ b/locale/ar.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/ast.json b/locale/ast.json index 3cb7831..eeb1d14 100644 --- a/locale/ast.json +++ b/locale/ast.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/ca.json b/locale/ca.json index 7c75267..f780455 100644 --- a/locale/ca.json +++ b/locale/ca.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/de.json b/locale/de.json index ebaef78..17e8245 100644 --- a/locale/de.json +++ b/locale/de.json @@ -166,35 +166,35 @@ "hideQuotesInTimeline": "Verberge Zitate in dieser Timeline", "userBlocks": "Benutzer, die du blockierst", "buttonBlocked": "Blockiert", - "buttonUnblock": "Blockierung aufheben", + "buttonUnblock": "Blockieren aufheben", "failedBlockingUser": "Blockieren des Benutzers fehlgeschlagen.", "failedUnblockingUser": "Aufheben der Blockierung fehlgeschlagen.", - "unblockUser": "Blockierung von {username} aufheben", + "unblockUser": "Blockieren von {username} aufheben", "tooltipBlocksYou": "{username} blockiert dich, sodass du ihm nicht folgen kannst.", - "silenced":"Silenced", - "silencedPlural":"Silenced profiles", - "silencedUsersOnThisInstance":"Silenced profiles on {site-title}", - "sandboxed":"Sandboxed", - "sandboxedPlural":"Sandboxed profiles", - "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", - "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "silenced":"Gesperrt", + "silencedPlural":"Gesperrte Nutzer", + "silencedUsersOnThisInstance":"Gesperrte Nutzer bei {site-title}", + "sandboxed":"in der Sandbox", + "sandboxedPlural":"Profile in der Sandbox", + "sandboxedUsersOnThisInstance":"Profile in der Sandbox bei {site-title}", + "silencedStreamDescription":"Gesperrte Benutzer können sich nicht einloggen oder posten und das, was bereits geschrieben wurde, wird nicht mehr angezeigt. Für lokale Benutzer ist das wie ein Löschvorgang, der wiederherstellbar ist, für entfernte Benutzer ist dies ein seitenweiter Block.", + "sandboxedStreamDescription":"Mitteilungen von Benutzern im Sandkasten werden sowohl aus der öffentlichen Zeitleiste als auch im gesamtbekannten Netz ausgeblendet. Mitteilungen von Benutzern im Sandkasten werden auch nicht nachträglich veröffentlicht.", "onlyShowNotificationsFromUsersIFollow":"Nur Benachrichtigungen von Nutzern anzeigen, denen ich folge", "userOptions":"More user actions", - "silenceThisUser":"Silence {nickname}", - "sandboxThisUser":"Sandbox {nickname}", - "unSilenceThisUser":"Unsilence {nickname}", - "unSandboxThisUser":"Unsandbox {nickname}", - "ERRORfailedSandboxingUser":"Failed sandboxing/unsandboxing the user", - "ERRORfailedSilencingUser":"Failed silencing/unsilencing the user", - "muteUser":"Mute", - "unmuteUser":"Unmute", - "hideNotificationsFromMutedUsers":"Hide notifications from muted users", - "thisIsANoticeFromAMutedUser":"You have muted the author of this quip. Click here to show it anyway.", - "userMutes":"Accounts you're muting", + "silenceThisUser":"{nickname} sperren", + "sandboxThisUser":"{nickname} in die Sandbox versetzen", + "unSilenceThisUser":"Sperre von {nickname} aufheben", + "unSandboxThisUser":"{nickname} aus der Sandbox entlassen", + "ERRORfailedSandboxingUser":"Fehler beim Versetzen in die Sandbox/Wiederzulassen des Benutzers", + "ERRORfailedSilencingUser":"Fehler beim Sperren oder Entsperren", + "muteUser":"Ausblenden", + "unmuteUser":"Ausblenden aufheben", + "hideNotificationsFromMutedUsers":"Benachrichtigungen von ausgeblendeten Benutzern verbergen", + "thisIsANoticeFromAMutedUser":"Du hast diesen Benutzer ausgeblendet. Hier kannst Du die Mitteilung trotzdem sichtbar machen.", + "userMutes":"Ausgeblendete Nutzer", "userBlocked":"Blockierte Nutzer", - "userMuted":"Muted accounts", - "mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.", + "userMuted":"Ausgeblendete Nutzer", + "mutedStreamDescription":"Du hast diese Nutzer in Deiner Timeline ausgeblendet. Benachrichtigungen von diesen Nutzern werden werden weiterhin angezeigt. Um sie ebenfalls zu verbergen, wähle im Zahnradmenu der Benachrichtigungsseite die Option "Benachrichtigungen von ausgeblendeten Benutzern verbergen".", "profileAndSettings":"Profil und Einstellungen", "profileSettings":"Profileinstellungen" } diff --git a/locale/en.json b/locale/en.json index f12bf6b..d4bbfa6 100644 --- a/locale/en.json +++ b/locale/en.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/es.json b/locale/es.json index 34e85b5..a6ad4c1 100644 --- a/locale/es.json +++ b/locale/es.json @@ -98,7 +98,7 @@ "signUpEmail": "Correo electrónico", "signUpButtonText": "Regístrate en {site-title}", "welcomeHeading": "Bienvenido a {site-title}", - "welcomeText": "Somos una
    « Federación » significa que no debes tener una cuenta de {site-title} para seguir su usuarios, estar seguido por o communicar con ellos. ¡Puedes registrar con cualquier servidor StatusNet o GNU social, o cualquier servicio utilizando el protocolo OStatus! También no debes registrarse en cualquier servicio para participar - simplemente instala el software GNU social en tu propio servidor. (:
    federación     de microblogueros que, como tú, estan motivados por ética y solidaridad y quieren abandonar los servicios capitalistas centralizados.", + "welcomeText": "Somos una
    «Federación» significa que no necesitas tener una cuenta de {site-title} para seguir a sus usuarios, estar seguido por o communicarte con ellos. ¡Puedes registrarte con cualquier servidor StatusNet o GNU social, o cualquier servicio utilizando el protocolo OStatus! Tampoco es preciso registrarse en algún servicio para participar, simplemente instala el software GNU social en tu propio servidor. (:
    federación     de microblogueros que, como tú, están motivados por ética y solidaridad, y quieren abandonar los servicios capitalistas centralizados.", "registerNickname": "Nombre de usuario", "registerHomepage": "Sitio web", "registerBio": "Biografía", @@ -118,13 +118,13 @@ "cropAndSave": "Recortar y guardar", "showTerms": "Leer los términos de uso", "ellipsisMore": "Más", - "blockUser": "Bloquear {username}", + "blockUser": "Bloquear a {username}", "goToOriginalNotice": "Ir al queet original", "goToTheUsersRemoteProfile": "Ir al perfil del usuario", - "clickToDrag":"Click para arrastrar", - "keyboardShortcuts":"Atajos de teclado", - "classicInterface":"Classic {site-title}", - "accessibilityToggleLink":"Para una mejor accesibilidad, clica este enlace para cambiar a la vista clásica", + "clickToDrag":"Clic para arrastrar", + "keyboardShortcuts":"Atajos del teclado", + "classicInterface":"Estilo clásico de {site-title}", + "accessibilityToggleLink":"Para una mejor accesibilidad, clica en este enlace para cambiar a la vista clásica", "tooltipBookmarkStream":"Añadir este stream a tus favoritos", "tooltipTopMenu":"Menú y configuración", "tooltipAttachImage":"Añade una imagen", @@ -133,7 +133,7 @@ "tooltipRemoveBookmark":"Eliminar el marcador", "clearHistory":"Limpiar el historial de navegación", "ERRORsomethingWentWrong":"Algo ha ido mal.", - "ERRORmustBeLoggedIn":"Debes iniciar sessión para ver el stream.", + "ERRORmustBeLoggedIn":"Debes iniciar sesión para ver el stream.", "ERRORcouldNotFindUserWithNickname":"No se ha encontrado el usuario con el apodo \"{nickname}\" en este servidor", "ERRORcouldNotFindGroupWithNickname":"No se ha encontrado el grupo con el nombre \"{nickname}\" en este servidor", "ERRORcouldNotFindPage":"No se pudo encontrar la página.", @@ -158,43 +158,42 @@ "listSubscribers":"Suscriptores", "ERRORcouldNotFindList":"La lista no existe.", "emailAlreadyInUse":"Ya en uso", - "addEditLanguageLink":"Ayuda a traducir {site-title} a otro lenguaje", - "onlyPartlyTranslated":"{site-title} solo está parcialmente traducido al {language-name} ({percent}%). Puedes ayudar a completar la traducción en Página del repositorio de Qvitter", + "addEditLanguageLink":"Ayuda a traducir {site-title} a otro idioma.", + "onlyPartlyTranslated":"{site-title} sólo está parcialmente traducido al {language-name} ({percent}%). Puedes ayudar a completar la traducción en Página del repositorio de Qvitter", "startRant":"Iniciar una conversación", "continueRant":"Continuar la conversación", "hideEmbeddedInTimeline":"Ocultar contenido incrustado en esta línea temporal", "hideQuotesInTimeline":"Ocultar citas en esta línea temporal", - "userBlocks":"Cuentas que estás bloqueando", + "userBlocks":"Usuarios a quienes has bloqueado", "buttonBlocked":"Bloqueado", "buttonUnblock":"Desbloquear", "failedBlockingUser":"Falló el bloqueo al usuario.", "failedUnblockingUser":"Falló el desbloqueo del usuario .", "unblockUser": "Desbloquear a {username}", - "tooltipBlocksYou":"Has sido bloqueado por {username}.", - "silenced":"Silenced", - "silencedPlural":"Silenced profiles", - "silencedUsersOnThisInstance":"Silenced profiles on {site-title}", - "sandboxed":"Sandboxed", - "sandboxedPlural":"Sandboxed profiles", - "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", - "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", - "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", - "userOptions":"More user actions", - "silenceThisUser":"Silence {nickname}", - "sandboxThisUser":"Sandbox {nickname}", - "unSilenceThisUser":"Unsilence {nickname}", - "unSandboxThisUser":"Unsandbox {nickname}", - "ERRORfailedSandboxingUser":"Failed sandboxing/unsandboxing the user", - "ERRORfailedSilencingUser":"Failed silencing/unsilencing the user", - "muteUser":"Mute", - "unmuteUser":"Unmute", - "hideNotificationsFromMutedUsers":"Hide notifications from muted users", - "thisIsANoticeFromAMutedUser":"You have muted the author of this quip. Click here to show it anyway.", - "userMutes":"Accounts you're muting", - "userBlocked":"Blocked accounts", - "userMuted":"Muted accounts", - "mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.", - "profileAndSettings":"Profile and settings", - "profileSettings":"Profile settings" + "tooltipBlocksYou":"{username} te ha bloqueado.", + "silenced":"Silenciado", + "silencedPlural":"Perfiles silenciados", + "silencedUsersOnThisInstance":"Perfiles silenciados en {site-title}", + "sandboxed":"Aislado", + "sandboxedPlural":"Perfiles aislados", + "sandboxedUsersOnThisInstance":"Perfiles aislados en {site-title}", + "silencedStreamDescription":"Los usuarios prohibidos no pueden iniciar sesión ni publicar queets y los ya publicados se ocultarán. Para usuarios locales es como una eliminación reversible; para usuarios remotos es como un bloqueo global.", + "sandboxedStreamDescription":"Los queets de usuarios aislados están excluidos de la línea temporal pública y de toda la red conocida. Los queets publicados durante el aislamiento no se incluirán en las líneas temporales públicas aunque se desactive el aislamiento al usuario.", "onlyShowNotificationsFromUsersIFollow":"Sólo mostrar notificaciones de usuarios a quienes sigo", + "userOptions":"Más opciones de usuario", + "silenceThisUser":"Prohibir a {nickname}", + "sandboxThisUser":"Aislar a {nickname}", + "unSilenceThisUser":"Desactivar la prohibición de {nickname}", + "unSandboxThisUser":"Desactivar el aislamiento de {nickname}", + "ERRORfailedSandboxingUser":"Falló el aislamiento o su desactivación del usuario", + "ERRORfailedSilencingUser":"Falló la prohibición o su desactivación del usuario", + "muteUser":"Silenciar", + "unmuteUser":"Desactivar silencio", + "hideNotificationsFromMutedUsers":"Ocultar notificaciones de usuarios silenciados", + "thisIsANoticeFromAMutedUser":"Has silenciado al autor de este queet. Haz clic para mostrarlo igualmente.", + "userMutes":"Usuarios que has silenciado", + "userBlocked":"Cuentas bloqueadas", + "userMuted":"Cuentas silenciadas", + "mutedStreamDescription":"Has ocultado estas cuentas de tu línea temporal. Seguirás recibiendo notificaciones de dichas cuentas a menos que selecciones "Ocultar notificaciones de usuarios silencioados" desde el menú con forma de rueda dentada en la página de notificaciones.", + "profileAndSettings":"Perfil y ajustes", + "profileSettings":"Ajustes del perfil" } diff --git a/locale/es_ahorita.json b/locale/es_ahorita.json index 92883d6..e00f15d 100644 --- a/locale/es_ahorita.json +++ b/locale/es_ahorita.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/eu.json b/locale/eu.json index a80f88a..f60a932 100644 --- a/locale/eu.json +++ b/locale/eu.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/fa.json b/locale/fa.json index 5ce0ae8..cecbab9 100644 --- a/locale/fa.json +++ b/locale/fa.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/fi.json b/locale/fi.json index d48747d..78cd2dc 100644 --- a/locale/fi.json +++ b/locale/fi.json @@ -179,7 +179,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/gl.json b/locale/gl.json index c46569f..b2e093a 100644 --- a/locale/gl.json +++ b/locale/gl.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/he.json b/locale/he.json index 476c5df..fb41d74 100644 --- a/locale/he.json +++ b/locale/he.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/io.json b/locale/io.json index 8692076..7ad1190 100644 --- a/locale/io.json +++ b/locale/io.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/it.json b/locale/it.json index 7fcdfb1..ca15048 100644 --- a/locale/it.json +++ b/locale/it.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/pt.json b/locale/pt.json index 6ccb12d..ede4a87 100644 --- a/locale/pt.json +++ b/locale/pt.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/ru.json b/locale/ru.json index dd5179a..9054c8d 100644 --- a/locale/ru.json +++ b/locale/ru.json @@ -176,7 +176,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/sq.json b/locale/sq.json index 458f990..a1f5f97 100644 --- a/locale/sq.json +++ b/locale/sq.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/sv.json b/locale/sv.json index b8c159e..80a2445 100644 --- a/locale/sv.json +++ b/locale/sv.json @@ -171,22 +171,22 @@ "failedUnblockingUser":"Misslyckades med att avblockera användaren.", "unblockUser": "Avblockera {username}", "tooltipBlocksYou":"Du är blockerad från att följa {username}.", - "silenced":"Nedtystad", - "silencedPlural":"Nedtystade användare", - "silencedUsersOnThisInstance":"Nedtystade användare på {site-title}", - "sandboxed":"I sandlådan", - "sandboxedPlural":"Användare i sandlådan", - "sandboxedUsersOnThisInstance":"Användare i sandlådan på {site-title}", - "silencedStreamDescription":"Nedtystade användare kan inte logga in eller skriva qvittringar. Qvittringar som de redan skrivit är dolda. För lokala användare är det som en borttagning som kan ångras, och för externa användare är det som att blockera användaren från instansen.", - "sandboxedStreamDescription":"Qvittringar från användare som är i sandlådan visas inte i "Hela sajtens flöde" eller "Hela det kända nätverket". Qvittringar som användaren skriver under tiden den är i sandlådan kommer inte visas i de offentliga flödena om hen tas ur sandlådan senare.", + "silenced":"Spärrad", + "silencedPlural":"Spärrade användare", + "silencedUsersOnThisInstance":"Spärrade användare på {site-title}", + "sandboxed":"Dold", + "sandboxedPlural":"Dolda användare", + "sandboxedUsersOnThisInstance":"Dolda användare på {site-title}", + "silencedStreamDescription":"Spärrade användare kan inte logga in eller skriva qvittringar. Qvittringar som de redan skrivit är dolda. För lokala användare är det som en borttagning som kan ångras, och för externa användare är det som att blockera användaren från instansen.", + "sandboxedStreamDescription":"Qvittringar från dolda användare visas inte i "Hela sajtens flöde" eller "Hela det kända nätverket". I övrigt kan de använda sajten som vanligt.", "onlyShowNotificationsFromUsersIFollow":"Visa bara notiser från användare som jag följer", "userOptions":"Fler användaråtgärder", - "silenceThisUser":"Tysta ner {nickname}", - "sandboxThisUser":"Sätt {nickname} i sandlådan", - "unSilenceThisUser":"Ta bort nedtystning av {nickname}", - "unSandboxThisUser":"Ta {nickname} ur sandlådan", - "ERRORfailedSandboxingUser":"Misslyckades med att sätta/ta ur användaren i sandlådan", - "ERRORfailedSilencingUser":"Misslyckades med att tysta ner eller ta bort nedtystning", + "silenceThisUser":"Spärra {nickname}", + "sandboxThisUser":"Dölj {nickname}", + "unSilenceThisUser":"Öppna kontot {nickname} igen", + "unSandboxThisUser":"Visa {nickname} i offentliga flöden igen", + "ERRORfailedSandboxingUser":"Misslyckades med att dölja användaren", + "ERRORfailedSilencingUser":"Misslyckades med att spärra eller öppna användaren", "muteUser":"Ignorera", "unmuteUser":"Sluta ignorera", "hideNotificationsFromMutedUsers":"Dölj notiser från användare som du ignorerar", diff --git a/locale/tr.json b/locale/tr.json index ff3e1be..25af705 100644 --- a/locale/tr.json +++ b/locale/tr.json @@ -178,7 +178,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/zh_cn.json b/locale/zh_cn.json index d1a5b60..f9729ff 100644 --- a/locale/zh_cn.json +++ b/locale/zh_cn.json @@ -177,7 +177,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}", diff --git a/locale/zh_tw.json b/locale/zh_tw.json index e645f8a..05657fd 100644 --- a/locale/zh_tw.json +++ b/locale/zh_tw.json @@ -177,7 +177,7 @@ "sandboxedPlural":"Sandboxed profiles", "sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}", "silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.", - "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.", + "sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Apart from that, they can use the site like any other user.", "onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow", "userOptions":"More user actions", "silenceThisUser":"Silence {nickname}",