Commit 6265ad3c authored by thedudeabides's avatar thedudeabides

Merge remote-tracking branch 'upstream/master' into librenet

parents 855fe43b 663da1ef
## Refactor
* Replace dandelion.jpg with a public domain photo [#7976](
## Bug fixes
* Fix incorrect post sorting on tag streams and tag searches for tags containing the word "activity" [#7959](
## Refactor
* Improve public stream performance and cleanup unused indexes [#7944](
* Improve wording of "Toggle mobile" [#7926](
## Bug fixes
* Do not autofollow back a user you are ignoring [#7913](
* Fix photos gallery when too many thumbnails are shown [#7943](
* Fix extended profile visibility switch showing the wrong state [#7955](
## Features
* Support ignore users on mobile [#7884](
## Refactor
......@@ -58,7 +58,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors"
gem "autoprefixer-rails", "8.6.5"
gem "bootstrap-sass", "3.3.7"
gem "bootstrap-switch-rails", "3.3.4"
gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see
gem "compass-rails", "3.1.0"
gem "sass-rails", "5.0.7"
gem "sprockets-rails", "3.2.1"
......@@ -69,7 +69,7 @@ GEM
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bootstrap-switch-rails (3.3.4)
bootstrap-switch-rails (3.3.3)
buftok (0.2.0)
builder (3.2.3)
byebug (10.0.2)
......@@ -772,7 +772,7 @@ DEPENDENCIES
asset_sync (= 2.5.0)
autoprefixer-rails (= 8.6.5)
bootstrap-sass (= 3.3.7)
bootstrap-switch-rails (= 3.3.4)
bootstrap-switch-rails (= 3.3.3)
capybara (= 3.11.1)
carrierwave (= 1.2.3)
compass-rails (= 3.1.0)

39.8 KB | W: | H:


63.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -69,7 +69,7 @@ app.models.Stream = Backbone.Collection.extend({
sortOrder : function() {
return /activity/.test(this.basePath()) ? "interactedAt" : "createdAt";
return /^\/activity/.test(this.basePath()) ? "interactedAt" : "createdAt";
/* This function is for adding a large number of posts one by one.
......@@ -41,7 +41,7 @@ app.views.Gallery = app.views.Base.extend({
if (image.naturalHeight > window.innerHeight && image.naturalHeight > image.naturalWidth * 2) {
} else {
var margins = 95; // Margins are 80px for thumbnails height and 15px for top image margin
var margins = 110; // Margins are 80px for thumbnails height and 15px for top image margin + scroll-x height = "max-height: " + (window.innerHeight - margins) + "px";
......@@ -50,15 +50,17 @@ $margin: 15px;
.indicator {
bottom: 0;
overflow-x: auto;
white-space: nowrap;
li {
border: 0;
border-radius: $thumbnail-size / 2;
height: $thumbnail-size;
margin: 6px;
margin-bottom: $margin;
margin: $margin 6px;
vertical-align: middle;
width: $thumbnail-size;
background-size: cover;
&:hover {
......@@ -350,6 +350,7 @@ footer {
.bottom-bar {
margin: 0;
position: static;
......@@ -694,6 +695,21 @@ select#aspect_ids_ {
.entypo-camera { margin-right: 0; }
.mobile-icon-bar {
background: $framed-background;
border-top: 1px solid $border-grey;
display: block;
padding: 1px 6px;
position: relative;
.mobile-icon-bar-button {
color: $text-grey;
float: right;
font-size: large;
padding: 0;
#publisher-textarea-wrapper {
border-radius: 2px;
margin: 12px 0px;
......@@ -64,7 +64,6 @@
<ul class="nav navbar-nav navbar-left visible-sm-block visible-xs-block">
<li class="visible-xs-block"><a href="/stream">{{t "my_stream"}}</a></li>
<li class="visible-xs-block"><a href="/activity">{{t "my_activity"}}</a></li>
<li><a href="/mobile/toggle">{{t "header.toggle_mobile"}}</a></li>
<ul class="nav navbar-nav navbar-right">
......@@ -87,6 +86,7 @@
{{else if current_user.moderator}}
<li><a href="/report">{{t "header.moderator"}}</a></li>
<li><a class="visible-xs-block" href="/mobile/toggle">{{t "header.switch_to_touch_optimized_mode"}}</a></li>
<li><a href="/users/sign_out" data-method="delete">{{t "header.log_out"}}</a></li>
......@@ -10,6 +10,7 @@ class BlocksController < ApplicationController
respond_to do |format|
format.json { head :no_content }
format.any { redirect_back fallback_location: root_path }
......@@ -11,6 +11,8 @@ class User
# @param [Aspect] aspect The aspect to add them to.
# @return [Contact] The newly made contact for the passed in person.
def share_with(person, aspect)
return if blocks.where(person_id:
contact = contacts.find_or_initialize_by(person_id:
return false unless contact.valid?
......@@ -5,4 +5,4 @@
= render partial: "api/openid_connect/error/error"
= link_to t("layouts.application.toggle"), toggle_mobile_path
= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
......@@ -26,4 +26,4 @@
= f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary"
= link_to t("layouts.application.toggle"), toggle_mobile_path
= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
......@@ -26,4 +26,4 @@
= link_to t(''), new_user_session_path()
= link_to t('layouts.application.toggle'), toggle_mobile_path
= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
......@@ -59,5 +59,5 @@
= unreviewed_reports_count
= t("")
%li= link_to t("layouts.application.toggle"), toggle_mobile_path
%li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
%li= link_to t("layouts.header.logout"), destroy_user_session_path, method: :delete
......@@ -10,7 +10,23 @@
= @person.diaspora_handle
- if user_signed_in? && @person != current_user.person
= render 'aspect_memberships/aspect_membership_dropdown'
- if @presenter.full_hash[:block]
= link_to t("users.privacy_settings.stop_ignoring"),
class: "btn btn-danger",
method: :delete
- else
= render "aspect_memberships/aspect_membership_dropdown"
- if user_signed_in? && @person != current_user.person && !@presenter.full_hash[:block]
= link_to "",
blocks_path(block: {person_id:}),
data: {confirm: t("are_you_sure_ignore_user")},
method: :post,
confirm: true,
class: "btn entypo-block shield mobile-icon-bar-button"
- if !@person.tag_string.blank? && user_signed_in?
......@@ -15,4 +15,4 @@
%li= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name)
%li= link_to t("layouts.application.toggle"), toggle_mobile_path
%li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
......@@ -21,4 +21,4 @@
id: "forgot_password_link"
- if display_registration_link?
%li= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name)
%li= link_to t("layouts.application.toggle"), toggle_mobile_path
%li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
......@@ -2,7 +2,7 @@
%li= link_to t("layouts.application.whats_new"), changelog_url
%li= link_to 'uptime', "", target: "_blank"
%li= link_to t("layouts.application.statistics_link"), statistics_path
%li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
%li= link_to t("layouts.application.switch_to_touch_optimized_mode"), toggle_mobile_path
%li= link_to 'Source code', "", target: "_blank"
- if AppConfig.settings.terms.enable?
%li= link_to t("_terms"), terms_path
......@@ -4,7 +4,7 @@
number: "" # Do not touch unless doing a release, do not backport the version number that's in master
number: "" # Do not touch unless doing a release, do not backport the version number that's in master
heroku: false
url: "http://localhost:3000/"
......@@ -217,7 +217,6 @@ ar:
powered_by: "بدعم DIASPORA*"
public_feed: "ملقم دياسبرا العام لـ %{name}"
source_package: "نزّل حزمة الشِّفرة المصدريّة"
toggle: "حَوِّل لموقع الهواتف المحمولة"
whats_new: "ما الجديد؟"
code: "شيفرة"
......@@ -217,7 +217,6 @@ bg:
back_to_top: "Нагоре"
powered_by: "Благодарение на DIASPORA*"
public_feed: "Публична емисия от Diaspora за %{name}"
toggle: "вкл./изкл. на мобилния изглед"
whats_new: "какво ново?"
code: "код"
......@@ -321,7 +321,6 @@ br:
public_feed: "Gwazh diaspora* foran evit %{name}"
source_package: "Pellgargañ pakad ar boneg tarzh"
toggle: "gweredekaat/diweredekaat ar stumm evit an hezougoù"
whats_new: "petra nevez ?"
code: "kod"
......@@ -299,7 +299,6 @@ bs:
powered_by: "POKREĆE DIASPORA*"
public_feed: "Javna Diaspora Veza za %{name}"
source_package: "preuzmi paket izvornog koda"
toggle: "štimanje mobilno"
whats_new: "šta je novo?"
code: "kod"
......@@ -215,6 +215,7 @@ cs:
tos: "Viz podmínky služby této aplikace"
are_you_sure: "Jste si jisti?"
are_you_sure_delete_account: "Opravdu chcete uzavřít svůj účet? Tuto operaci nelze vrátit!"
are_you_sure_ignore_user: "Tohoto uživatele budete ignorovat. Opravdu to chcete?"
failure: "Nepodařilo se odstranit osobu z aspektu"
......@@ -653,7 +654,8 @@ cs:
public_feed: "Veřejný proud diaspory* pro %{name}"
source_package: "Stáhnout balík se zdrojovým kódem"
statistics_link: "Statistiky podu"
toggle: "Přepnout mobilní / plnou verzi"
switch_to_standard_mode: "Přepnutí do standardního režimu"
switch_to_touch_optimized_mode: "Přepnutí do režimu dotykového displeje"
whats_new: "Co je nového?"
code: "Kód"
......@@ -1253,8 +1255,9 @@ cs:
new_password: "Nové heslo"
private_message: "obdržíte soukromou zprávu"
description: "Kliknutím na toto tlačítko bude do Vašeho prohlížeče nainstalován handler, který nám dovolí otevírat adresy URL typu web+diaspora:// na Vašem domácím podu. Tohle je aktuálně experimentální a interakce budou záležet na Vašem prohlížeči."
register: "Registrovat"
browser: "Tento protokol je aktuálně v experimentálním stádiu a úspěšnost interakcí pomocí něj bude záležet na Vašem prohlížeči. Pokud chcete spravovat nebo odstranit tento handler, musíte to udělat v nastaveních Vašeho prohlížeče. Tlačítko níže bude vždy povolené a budete muset nastavit handler zvlášť na každém prohlížeči, který používáte."
description: "web+diaspora:// je nový webový protokol, který jsme představili. Jakýkoliv odkaz na stránku diaspora* na externí stránce, který tento protokol používá, může být otevřen v podu, na kterém je registrován Váš účet diaspora*. Kliknutím na tlačítko níže nastavíte Váš prohlížeč, aby pro rozpoznávání externích odkazů web+diaspora:// používal adresu %{pod_url}."
register: "Registrovat handler web+diaspora:// na tomto prohlížečí"
title: "Handler pro protokol web+diaspora://"
receive_email_notifications: "Přijímat oznámení e-mailem, když:"
request_export: "Vyžádat si profilová data"
......@@ -68,8 +68,6 @@ cy:
sent: "Your invitation has been sent."
toggle: "toggle mobile site"
logout: "Allgofnodi"
profile: "profile"
......@@ -205,6 +205,7 @@ da:
tos: "Se applikationens servicevilkår"
are_you_sure: "Er du sikker?"
are_you_sure_delete_account: "Er du helt sikker at du ønsker at lukke din konto? Det kan ikke fortrydes!"
are_you_sure_ignore_user: "Vil du ignorere denne bruger. Er du sikker?"
failure: "Kunne ikke fjerne person fra aspekt."
......@@ -642,7 +643,6 @@ da:
public_feed: "Offentligt Diaspora-nyhedsfeed for %{name}"
source_package: "Download kildekoden"
statistics_link: "Pod statistik"
toggle: "Slå mobil side til/fra"
whats_new: "Hvad er nyt?"
code: "Kode"
......@@ -346,7 +346,6 @@ de-CH:
public_feed: "Öffentliche diaspora* Feed vo %{name}"
source_package: "Lad's Quellcodepaket abe"
statistics_link: "Pod Statistike"
toggle: "Mobiili Aasicht umschalte"
whats_new: "Was git's neus?"
code: "Code"
......@@ -627,7 +627,6 @@ de-moo:
public_feed: "Öffentlicher diaspora* Feed von %{name}"
source_package: "Quellcodepaket herunterladen"
statistics_link: "Bauernhof-Statistiken"
toggle: "Mobile Ansicht umschalten"
whats_new: "Was gibt's Neues?"
code: "Code"
......@@ -101,7 +101,7 @@ de:
? "no"
: Nein
nsfw: "NSFW (unpassend für den Arbeitsplatz)"
spotlight: "Interessante Leute"
spotlight: "Schaukasten"
unknown: "Unbekannt"
? "yes"
: Ja
......@@ -112,24 +112,24 @@ de:
add_admin: "%{name} wurde zum Administrator ernannt."
add_invites: "Einladungen hinzufügen"
add_moderator: "%{name} wurde zum Moderator ernannt."
add_spotlight: "%{name} wurde zu Interessante Leute hinzugefügt."
add_spotlight: "%{name} wurde in den Gemeinschafts-Schaukasten gestellt"
are_you_sure: "Möchtest du dein Konto wirklich schließen?"
are_you_sure_lock_account: "Bist du dir sicher, dass du dieses Konto sperren möchtest?"
are_you_sure_unlock_account: "Bist du dir sicher, dass du dieses Konto entsperren möchtest?"
close_account: "Konto schließen"
delete_admin: "%{name} wurde von der Liste der Administratoren entfernt."
delete_moderator: "%{name} wurde von der Liste der Moderatoren entfernt."
delete_spotlight: "%{name} wurde aus Interessante Leute entfernt."
delete_spotlight: "%{name} wurde vom Gemeinschafts-Schaukasten entfernt."
does_not_exist: "Benutzer existiert nicht!"
email_to: "per E-Mail einladen"
invite: "einladen"
lock_account: "Konto sperren"
make_admin: "Zum Administrator ernennen"
make_moderator: "Zum Moderator ernennen"
make_spotlight: "Zu Interessante Leute hinzufügen"
make_spotlight: "In den Gemeinschafts-Schaukasten stellen"
remove_admin: "Als Administrator entfernen"
remove_moderator: "Als Moderator entfernen"
remove_spotlight: "Aus Interessante Leute entfernen"
remove_spotlight: "Aus dem Gemeinschafts-Schaukasten entfernen"
role_implemented: "%{name} hat diese Rolle bereits erhalten!"
role_removal_implemented: "%{name} wurde diese Rolle bereits entzogen!"
under_13: "Zeige Benutzer, die unter 13 Jahre alt sind (COPPA)"
......@@ -645,7 +645,7 @@ de:
public_feed: "Öffentlicher diaspora* Feed von %{name}"
source_package: "Quelltextpaket runterladen"
statistics_link: "Pod-Statistiken"
toggle: "Mobile Ansicht umschalten"
switch_to_touch_optimized_mode: "Wechseln zum touch-optimierten Modus"
whats_new: "Was gibt’s Neues?"
code: "Code"
......@@ -627,7 +627,6 @@ de_formal:
public_feed: "Öffentlicher diaspora* Feed von %{name}"
source_package: "Quelltextpaket herunterladen"
statistics_link: "Pod-Statistiken"
toggle: "Mobile Ansicht umschalten"
whats_new: "Was gibt’s Neues?"
code: "Code"
......@@ -290,7 +290,6 @@ el:
powered_by: "Powered by diaspora*"
public_feed: "Δημόσια ανατροφοδότηση (feed) του diaspora* για τον χρήστη %{name}"
source_package: "Μεταφορτώστε το πακέτο του πηγαίου κώδικα"
toggle: "Αλλαγή σε κινητό"
whats_new: "Τι νέα;"
code: "Κώδικας"
......@@ -20,6 +20,7 @@ en:
email: "Email"
are_you_sure: "Are you sure?"
are_you_sure_delete_account: "Are you sure you want to close your account? This can’t be undone!"
are_you_sure_ignore_user: "You are going to ignore that user. Are you sure?"
fill_me_out: "Fill me out"
public: "Public"
limited: "Limited"
......@@ -615,7 +616,8 @@ en:
whats_new: "What’s new?"
statistics_link: "Pod statistics"
discourse: "Project discussions and support"
toggle: "Toggle mobile"
switch_to_touch_optimized_mode: "Switch to touch-optimized mode"
switch_to_standard_mode: "Switch to standard mode"
public_feed: "Public diaspora* feed for %{name}"
back_to_top: "Back to top"
source_package: "Download the source code package"
......@@ -226,7 +226,6 @@ en_1337:
powered_by: "P0W3R3D BY D*"
public_feed: "PUBL1C D* F33D F0R %{name}"
source_package: "D0WNL04D 7H3 5AUC3"
toggle: "70GGL3 M0B1L3"
whats_new: "WH475 N3W?"
code: "C0D3"
......@@ -190,7 +190,6 @@ en_pirate:
powered_by: "This ship be POWERED BY diaspora*"
public_feed: "Sea-wide diaspora* feed for %{name}"
source_package: "Download the blueprints! Argh!"
toggle: "toggl' mobile site"
whats_new: "what be new?"
code: "Code"
......@@ -125,7 +125,6 @@ en_shaw:
powered_by: "𐑐𐑬𐑮𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
public_feed: "𐑐𐑳𐑚𐑤𐑦𐑒 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑰𐑛 𐑓𐑹 %{name}"
toggle: "𐑑𐑪𐑜𐑩𐑤 𐑥𐑴𐑚𐑩𐑤 𐑕𐑲𐑑"
whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
code: "𐑒𐑴𐑛"
......@@ -477,7 +477,6 @@ en_valspeak:
public_feed: "the feed for %{name} that like... every1 can c n stuff"
source_package: "dl code n stuff.."
statistics_link: "Pod statz"
toggle: "make like... phone friendly..."
whats_new: "sup?"
code: "code"
......@@ -326,7 +326,6 @@ eo:
public_feed: "Publika DIASPORA* Afiŝostrio de %{name}"
source_package: "elŝutu la pakaĵon kun la fontkodo"
toggle: "ŝalti inter tiu kaj poŝtelefona versio"
whats_new: "kio estas nova?"
code: "kodo"
......@@ -611,7 +611,6 @@ es-AR:
public_feed: "Canal público para %{name}"
source_package: "Descargar el paquete con el código fuente"
statistics_link: "Estadísticas del pod"
toggle: "Cambiar a celular"
whats_new: "¿Qué hay de nuevo?"
code: "Código"
......@@ -361,7 +361,6 @@ es-CL:
public_feed: "Canal publico de %{name}"
source_package: "descargar paquete de código fuente"
toggle: "cambiar sitio móvil"
whats_new: "¿Qué hay de nuevo?"
code: "codigo"
......@@ -156,7 +156,6 @@ es-CO:
back_to_top: "Volver al principio"
public_feed: "Canal público de Diaspora para %{name}"
toggle: "Cambiar a interfaz móvil"
whats_new: "¿Qué hay de nuevo?"
code: "código"
......@@ -312,6 +312,10 @@ es-MX:
stream_full_of_posts_q: "¿Por qué está mi «Entrada» llena de publicaciones de gente que no conozco, y con las cuales no estoy compartiendo?"
title: "Publicaciones y cómo publicar"
can_comment_a: "Solo los usuarios de diaspora* que hayas agregado a ese aspecto podrán comentar o marcar \"Me gusta\" en tu publicación privada."
can_comment_q: "¿Quién puede comentar o dar \"Me gusta\" a mi publicación privada?"
can_reshare_a: "Nadie. Las publicaciones privadas no son re-compartibles. Sin embargo, los usuarios de diaspora* en ese aspecto pueden potencialmente copiar y pegarlo. Depende de si usted confía en esas personas."
can_reshare_q: "¿Quién puede volver a compartir mi publicación privada?"
title: "Publicaciones privadas"
who_sees_post_a: "Únicamente los usuarios de diaspora* que hayan iniciado sesión, y a quienes hayas añadido a dicho aspecto, podrán ver tu publicación limitada."
who_sees_post_q: "¿Cuando publico un mensaje para un aspecto (es decir, una publicación privada) quién puede verlo?"
......@@ -383,7 +387,6 @@ es-MX:
powered_by: "POWERED BY diaspora*"
public_feed: "Canal público de Diaspora para %{name}"
source_package: "descargar el paquete del código fuente"
toggle: "Cambiar a sitio móvil"
whats_new: "¿Qué hay de nuevo?"
code: "código"
......@@ -200,6 +200,7 @@ es:
tos: "Ver los Términos de Servicio de la aplicación"
are_you_sure: "¿Estás seguro?"
are_you_sure_delete_account: "¿Seguro que quieres eliminar tu cuenta? ¡Esto no se podrá deshacer!"
are_you_sure_ignore_user: "Vas a bloquear a este usuario. ¿Estás seguro?"
failure: "No se pudo quitar a la persona del aspecto."
......@@ -637,7 +638,8 @@ es:
public_feed: "Canal público de %{name} "
source_package: "Descargar el paquete del código fuente"
statistics_link: "Estadísticas del pod"
toggle: "Cambiar a interfaz móvil"
switch_to_standard_mode: "Cambiar al modo estándar"
switch_to_touch_optimized_mode: "Cambiar al modo optimizado para pantallas táctiles"
whats_new: "Novedades"
code: "Código"
......@@ -220,7 +220,6 @@ eu:
back_to_top: "Gora"
public_feed: "%{name}(r)en Diaspora Feed publikoa"
toggle: "gaitu mugikorreko orrialdea"
whats_new: "zer berri?"
code: "kodea"
......@@ -601,7 +601,6 @@ fi:
public_feed: "Käyttäjän %{name} julkinen Diaspora-uutisvirta"
source_package: "Lataa lähdekoodipaketti"
statistics_link: "Podin tilastot"
toggle: "Mobiilisivusto päälle/pois"
whats_new: "Uutta"
code: "Lähdekoodi"
......@@ -69,8 +69,6 @@ fil:
no_contacts: "No contacts."
title: "Mateys"
toggle: "toggle mobile site"
logout: "abandon ship"
profile: "profile"
......@@ -208,6 +208,7 @@ fr:
tos: "Voir les conditions d'utilisation de l'application"
are_you_sure: "Êtes-vous certain ?"
are_you_sure_delete_account: "Souhaitez-vous vraiment supprimer votre compte ? Cette action est définitive !"
are_you_sure_ignore_user: "Vous êtes sur le point d'ignorer cet utilisateur. Êtes-vous sûr ?"
failure: "La personne n'a pas pu être supprimée de l'aspect."
......@@ -647,7 +648,8 @@ fr:
public_feed: "Flux diaspora* public de %{name}"
source_package: "Téléchargez le code source"
statistics_link: "Statistiques du pod"
toggle: "Activer/désactiver la version mobile"
switch_to_standard_mode: "Utiliser la version classique"
switch_to_touch_optimized_mode: "Utiliser la version tactile"
whats_new: "Quoi de neuf ?"
code: "Code"
......@@ -286,7 +286,6 @@ he:
powered_by: "מופעל על ידי דיאספורה*"
public_feed: "פרסומים ציבוריים בדיאספורה* מאת %{name}"
source_package: "הורדת חבילת קוד המקור"
toggle: "הפעלה/כיבוי תצוגת מכשיר נייד"
whats_new: "מה חדש?"
code: "קוד"
......@@ -488,7 +488,6 @@ hu:
public_feed: "%{name} nyilvános diaspora* hírfolyama"
source_package: "forráskódcsomag letöltése"
statistics_link: "pod statisztika"
toggle: "mobil változat"
whats_new: "mik az újdonságok?"
code: "kód"
......@@ -619,7 +619,6 @@ hye-classical:
public_feed: "%{name}-ի` դիասպորա*֊ի հրապարակային հոսքը"
source_package: "Ներբեռնել սկզբնական կոդի փաթեթը"
statistics_link: "Հանգոյցի վիճակագրութիւն"
toggle: "Դիւրակիր տարբերակը"
whats_new: "Ի՞նչ կա"
code: "Կոդ"
......@@ -616,7 +616,6 @@ hye:
public_feed: "%{name}-ի` դիասպորա*յի հրապարակային հոսքը"
source_package: "Ներբեռնել սկզբնական կոդի փաթեթը"
statistics_link: "Հանգույցի վիճակագրություն"
toggle: "Դյուրակիր տարբերակը"
whats_new: "Ի՞նչ կա"
code: "Կոդ"
......@@ -152,7 +152,6 @@ hyw:
back_to_top: "Թռիլ վեր"
powered_by: "Կ՚աշխատի տիասփորա*-ի օգնութեամբ"
public_feed: "%{name}-ին` տիասփորա*-ի հրապարակային հոսքը"
toggle: "Դիւրակիր տարբերակ"
whats_new: "Ի՞նչ կայ չկայ"
code: "Քոտ"
......@@ -190,6 +190,7 @@ ia:
tos: "Vider le conditiones de servicio del application"
are_you_sure: "Es tu secur?"
are_you_sure_delete_account: "Es tu secur de voler clauder tu conto? Isto non pote esser disfacite!"
are_you_sure_ignore_user: "Tu va ignorar iste usator. Es tu secur?"