manual merge of #287

This commit is contained in:
Hannes Mannerheim 2015-10-17 10:02:15 +02:00
parent 4477ed8eb0
commit 68f1ae1929
2 changed files with 23 additions and 23 deletions

View File

@ -3,11 +3,11 @@
<p><span class="shortcut">f</span><span class="description">Markizar kom favorato</span></p>
<p><span class="shortcut">r</span><span class="description">Respondar</span></p>
<p><span class="shortcut">t</span><span class="description">Repetar</span></p>
<p><span class="shortcut">Enter</span><span class="description">Expansigar la mesajo</span></p>
<p><span class="shortcut">Enter</span><span class="description">Estalar la mesajo</span></p>
<p><span class="shortcut">Ctrl</span><span class="shortcut">Enter</span>o <span class="shortcut">Cmd ⌘</span><span class="shortcut">Enter</span><span class="description">Sendar la mesajo</span></p>
<p><span class="shortcut">Esc</span><span class="description">Kompaktigar omna expansigita mesaji</span></p>
<p><span class="shortcut">Esc</span><span class="description">Foldar omna estalita mesaji</span></p>
<h3>Navigo</h3>
<p><span class="shortcut">?</span><span class="description">Ica menuo</span></p>
<p><span class="shortcut">j</span><span class="description">Nexta mesajo</span></p>
<p><span class="shortcut">j</span><span class="description">Sequanta mesajo</span></p>
<p><span class="shortcut">k</span><span class="description">Preiranta mesajo</span></p>

View File

@ -16,10 +16,10 @@
"logout": "Deskonektar me",
"languageSelected": "Linguo:",
"viewMyProfilePage": "Vidar mea profil-pagino",
"expand": "Expansigar",
"collapse": "Kompaktigar",
"expand": "Estalar",
"collapse": "Faldar",
"details": "Detali",
"expandFullConversation": "Expansigar la tota konverso",
"expandFullConversation": "Estalar la tota konverso",
"replyVerb": "Respondar",
"requeetVerb": "Repetar",
"favoriteVerb": "Favorar",
@ -71,19 +71,19 @@
"viewMoreInConvAfter": "Vidar plue dil konverso →",
"mentions": "Mencioni",
"timeline": "Tempolineo",
"publicTimeline": "Publika tempolineo",
"publicAndExtTimeline": "Tota retaro",
"publicTimeline": "Che {site-title}",
"publicAndExtTimeline": "Del tota retaro",
"searchVerb": "Serchez…",
"deleteVerb": "Efacar",
"deleteVerb": "Supresar",
"cancelVerb": "Anular",
"deleteConfirmation": "Ka vu certe volas efacar la avizo?",
"deleteConfirmation": "Ka vu certe volas supresar la avizo?",
"userExternalFollow": "Sequar",
"userExternalFollowHelp": "L'identifikilo di vua konto (ex. uzero@quitter.no)",
"userFollow": "Sequar",
"userFollowing": "Sequanta",
"userUnfollow": "Cesar la sequo",
"joinGroup": "Unionar me al grupo",
"joinExternalGroup": "Unionar me al grupo",
"userUnfollow": "Cesar sequar",
"joinGroup": "Membreskar",
"joinExternalGroup": "Membreskar",
"isMemberOfGroup": "Membro",
"leaveGroup": "Abandonar",
"memberCount": "Membri",
@ -98,7 +98,7 @@
"signUpEmail": "E-adreso",
"signUpButtonText": "Registragar me che {site-title}",
"welcomeHeading": "Bonvenez che {site-title}!",
"welcomeText": "Ni esas <span id=\"federated-tooltip\"><div id=\"what-is-federation\">\"Federo\" signifikas ke konto che {site-title} ne esas necesa por sequar, esar sequata da, od interagar kun uzeri di {site-title}. Vu povas registragar en servilo di GNU Social od en irga servado fondita sur la protokolo <a href=\"http://www.w3.org/community/ostatus/wiki/Main_Page\">OStatus</a>! Vu ne mem mustas juntar vu a servado: probez instalar l'aminda softwaro <a href=\"http://www.gnu.org/software/social/\">GNU Social</a> ye vua propra servilo! :)</div>federo</span> di mikroblogeri qui sucias etiko e solidareso, e qui volas abandonar la centraligita kapitalista servadi.",
"welcomeText": "Ni esas <span id=\"federated-tooltip\"><div id=\"what-is-federation\">\"Federo\" signifikas, ke konto che {site-title} esas fakultativa por sequar, esar sequata da, od interagar kun uzeri di {site-title}. Vu povas registragar vu en servilo di GNU Social od en irga servado fondita sur la protokolo <a href=\"http://www.w3.org/community/ostatus/wiki/Main_Page\">OStatus</a>! Vu ne mem mustas juntar vu a servado: probez instalar l'aminda programo <a href=\"http://www.gnu.org/software/social/\">GNU Social</a> ye vua propra servilo! :)</div>federo</span> de mikroblogeri qui sucias etiko e solidareso, e qui deziras abandonar la centraligita e kapitalista servadi.",
"registerNickname": "Uzer-nomo",
"registerHomepage": "Frontispico",
"registerBio": "Biografio",
@ -106,22 +106,22 @@
"registerRepeatPassword": "Repetez la pas-vorto",
"moreSettings": "Plusa ajusti",
"otherServers": "Altre vu povas krear konto ye altra servilo di la reto GNU Social. <a href=\"http://federation.skilledtests.com/select_your_server.html\">Komparar</a>",
"editMyProfile": "Modifikar la profilo",
"editMyProfile": "Modifikar mea profilo",
"notifications": "Avizi",
"xFavedYourQueet": "favoras vua mesajo",
"xRepeatedYourQueet": "repetis vua mesajo",
"xStartedFollowingYou": "komencis sequar vu",
"xStartedFollowingYou": "sequeskis vu",
"followsYou": "sequas vu",
"FAQ": "Ofta questioni",
"inviteAFriend": "Invitez amiko!",
"goToExternalProfile": "Irar al kompleta profilo",
"cropAndSave": "Rekortar e konservar",
"showTerms": "Lektez nia uzokondicioni",
"ellipsisMore": "Pluso",
"ellipsisMore": "Pluse",
"blockUser": "Blokusar {username}",
"goToOriginalNotice": "Irar al originala mesajo",
"goToTheUsersRemoteProfile": "Irar al profilo di la uzero",
"clickToDrag":"Klikez por tranar",
"clickToDrag":"Klikez por tranar la imajo",
"keyboardShortcuts":"Agi per klavaro",
"classicInterface":"Klasika {site-title}",
"accessibilityToggleLink":"Por plu bona acesebleso, klikez ica ligilo por enswichar la klasika uzer-interfacio.",
@ -130,12 +130,12 @@
"tooltipAttachImage":"Atachar imajo",
"tooltipShortenUrls":"Plukurtigar omna ret-adresi en la mesajo",
"tooltipReloadStream":"Aktualigar ica diskuto-fluo",
"tooltipRemoveBookmark":"Removar ica marko-rubando",
"tooltipRemoveBookmark":"Supresar ica marko-rubando",
"clearHistory":"Vakuigar la navigo-historio",
"ERRORsomethingWentWrong":"Ulo mala eventis.",
"ERRORsomethingWentWrong":"Ulo miseventis.",
"ERRORmustBeLoggedIn":"Vu mustas esar identifikita por vidar ica diskuto-fluo.",
"ERRORcouldNotFindUserWithNickname":"Onu ne povis trovar uzero kun la uzer-nomo \"{nickname}\" en ica servilo.",
"ERRORcouldNotFindGroupWithNickname":"Onu ne povis trovar grupo kun la group-nomo \"{nickname}\" en ica servilo.",
"ERRORcouldNotFindPage":"Onu ne povis trovar ica pagino.",
"ERRORcouldNotFindUserWithNickname":"On ne trovis uzero kun la nomo \"{nickname}\" en ica servilo.",
"ERRORcouldNotFindGroupWithNickname":"On ne trovis grupo kun la nomo \"{nickname}\" en ica servilo.",
"ERRORcouldNotFindPage":"On ne trovis ica pagino.",
"ERRORnoticeRemoved": "This notice has been removed."
}