Add a page listing people someone follows (#444)

Nothing exceptional, the layout is the same as the followers page. Fixes #325
5 years ago · e28371bbe4
parent 7bac70a483
commit e28371bbe4
24 changed files with 943 additions and 431 deletions
--- a/plume-models/src/users.rs
+++ b/plume-models/src/users.rs
@ -568,7 +568,7 @@ impl User {
            .map_err(Error::from)
    }

-    pub fn get_following(&self, conn: &Connection) -> Result<Vec<User>> {
+    pub fn get_followed(&self, conn: &Connection) -> Result<Vec<User>> {
        use schema::follows::dsl::*;
        let f = follows.filter(follower_id.eq(self.id)).select(following_id);
        users::table
@ -577,6 +577,28 @@ impl User {
            .map_err(Error::from)
    }

+    pub fn count_followed(&self, conn: &Connection) -> Result<i64> {
+        use schema::follows;
+        follows::table
+            .filter(follows::follower_id.eq(self.id))
+            .count()
+            .get_result(conn)
+            .map_err(Error::from)
+    }
+
+    pub fn get_followed_page(&self, conn: &Connection, (min, max): (i32, i32)) -> Result<Vec<User>> {
+        use schema::follows;
+        let follows = follows::table
+            .filter(follows::follower_id.eq(self.id))
+            .select(follows::following_id)
+            .limit((max - min).into());
+        users::table
+            .filter(users::id.eq_any(follows))
+            .offset(min.into())
+            .load::<User>(conn)
+            .map_err(Error::from)
+    }
+
    pub fn is_followed_by(&self, conn: &Connection, other_id: i32) -> Result<bool> {
        use schema::follows;
        follows::table
--- a/po/plume/ar.po
+++ b/po/plume/ar.po
@ -19,9 +19,9 @@ msgstr ""
 msgid "{0} commented your article."
 msgstr "علَّق {0} على مقالك"

-#, fuzzy
-msgid "{0} is now following you."
-msgstr "إنّ {0} يتبعك الآن"
+# src/template_utils.rs:35
+msgid "{0} is subscribed to you."
+msgstr ""

 #, fuzzy
 msgid "{0} liked your article."
@ -73,7 +73,8 @@ msgstr "يجب عليك تسجيل الدخول قصد الإعجاب بالمن
 msgid "You need to be logged in order to access your dashboard"
 msgstr "يجب عليك أولا تسجيل الدخول للوصول إلى لوح التحكم"

-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "يجب عليك أولا تسجيل الدخول قصد متابعة شخص آخر"

 msgid "You need to be logged in order to edit your profile"
@ -162,7 +163,8 @@ msgstr "كافة مقالات الفديفرس"
 msgid "Articles from {}"
 msgstr "مقالات مِن {0}"

-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "حاليا لا يوجد أي شيء هنا. حاول متابعة أشخاص آخرين."

 msgid "Name"
@ -292,8 +294,12 @@ msgstr ""
 msgid "Articles"
 msgstr "المقالات"

-msgid "Followers"
-msgstr "المتابِعون"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "الوصف"

 #, fuzzy
 msgid "Atom feed"
@ -314,14 +320,19 @@ msgstr "تعديل ملفك الشخصي"
 msgid "Open on {0}"
 msgstr "افتح على {0}"

-msgid "Unfollow"
-msgstr "الغاء المتابعة"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "اتبع"
+msgid "Subscribe"
+msgstr ""

-msgid "{0}'s followers"
-msgstr "{0} متابِعون"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "الوصف"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "الوصف"

 msgid "Respond"
 msgstr "رد"
@ -702,6 +713,26 @@ msgstr "قم بنسخه و إلصاقه في محتوى مقالك لعرض ال
 msgid "Use as avatar"
 msgstr "استخدمها كصورة رمزية"

+#~ msgid "{0}'s followers"
+#~ msgstr "{0} متابِعون"
+
+#, fuzzy
+#~ msgid "{0} is now following you."
+#~ msgstr "إنّ {0} يتبعك الآن"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "{0} متابِعون"
+
+#~ msgid "Followers"
+#~ msgstr "المتابِعون"
+
+#~ msgid "Unfollow"
+#~ msgstr "الغاء المتابعة"
+
+#~ msgid "Follow"
+#~ msgstr "اتبع"
+
 #~ msgid "Comment \"{0}\""
 #~ msgstr "تعليق \"{0}\""

--- a/po/plume/de.po
+++ b/po/plume/de.po
@ -18,7 +18,7 @@ msgid "{0} commented your article."
 msgstr "{0} hat deinen Artikel kommentiert"

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 #, fuzzy
@ -79,7 +79,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr "Du musst eingeloggt sein, um dein Dashboard zu sehen"

 #, fuzzy
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Du musst eingeloggt sein, um jemandem zu folgen"

 #, fuzzy
@ -175,7 +175,7 @@ msgid "Articles from {}"
 msgstr "Artikel von {0}"

 #, fuzzy
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "Hier gibts noch nichts. Versuche dich mehr Leuten anzuschließen."

 msgid "Name"
@ -315,8 +315,11 @@ msgstr ""
 msgid "Articles"
 msgstr "Artikel"

-msgid "Followers"
-msgstr "Follower"
+msgid "Subscribers"
+msgstr "Abonomenten"
+
+msgid "Subscriptions"
+msgstr "Abonoment"

 #, fuzzy
 msgid "Atom feed"
@ -338,15 +341,19 @@ msgstr "Ändere dein Profil"
 msgid "Open on {0}"
 msgstr ""

-#, fuzzy
-msgid "Unfollow"
-msgstr "Folgen"
+msgid "Unsubscribe"
+msgstr "Abbestellen"

-msgid "Follow"
-msgstr "Folgen"
+msgid "Subscribe"
+msgstr "Abonieren"

-msgid "{0}'s followers"
-msgstr "{0}s Follower"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "Abonoment"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Abonoment"

 msgid "Respond"
 msgstr "Antworten"
@ -725,6 +732,27 @@ msgstr "Um diese Mediendatei einzufügen, kopiere sie in deine Artikel."
 msgid "Use as avatar"
 msgstr "Als Avatar verwenden"

+#~ msgid "{0}'s followers"
+#~ msgstr "{0}s Follower"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "{0}s Follower"
+
+#~ msgid "Followers"
+#~ msgstr "Follower"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "Folgen"
+
+#, fuzzy
+#~ msgid "Unfollow"
+#~ msgstr "Folgen"
+
+#~ msgid "Follow"
+#~ msgstr "Folgen"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Bisher keine Artikel vorhanden."
--- a/po/plume/en.po
+++ b/po/plume/en.po
@ -19,7 +19,7 @@ msgid "{0} commented your article."
 msgstr ""

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 # src/template_utils.rs:36
@ -83,7 +83,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr ""

 # src/routes/user.rs:164
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr ""

 # src/routes/user.rs:227
@ -171,7 +171,7 @@ msgstr ""
 msgid "Articles from {}"
 msgstr ""

-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr ""

 # src/template_utils.rs:144
@ -299,7 +299,10 @@ msgstr ""
 msgid "Articles"
 msgstr ""

-msgid "Followers"
+msgid "Subscribers"
+msgstr ""
+
+msgid "Subscriptions"
 msgstr ""

 msgid "Atom feed"
@ -320,13 +323,16 @@ msgstr ""
 msgid "Open on {0}"
 msgstr ""

-msgid "Unfollow"
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Subscribe"
 msgstr ""

-msgid "Follow"
+msgid "{0}'s subscriptions'"
 msgstr ""

-msgid "{0}'s followers"
+msgid "{0}'s subscribers"
 msgstr ""

 msgid "Respond"
--- a/po/plume/es.po
+++ b/po/plume/es.po
@ -14,157 +14,198 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2.2\n"

-msgid "Latest articles"
-msgstr "Últimas publicaciones"
+#, fuzzy
+msgid "{0} commented your article."
+msgstr "{0} gusto tu publicación"
+
+# src/template_utils.rs:35
+msgid "{0} is subscribed to you."
+msgstr ""

 #, fuzzy
-msgid "No posts to see here yet."
-msgstr "No hay publicaciones para ver aquí ahora."
+msgid "{0} liked your article."
+msgstr "{0} gusto tu publicación"

-msgid "New article"
-msgstr "Nueva publicación"
+msgid "{0} mentioned you."
+msgstr ""

-msgid "New blog"
-msgstr "Nuevo blog"
+#, fuzzy
+msgid "{0} boosted your article."
+msgstr "{0} gusto tu publicación"

-msgid "Create a blog"
-msgstr "Crear un blog"
+# src/template_utils.rs:68
+msgid "{0}'s avatar"
+msgstr ""

-msgid "Title"
-msgstr "Título"
+msgid "You need to be logged in order to create a new blog"
+msgstr "Necesitas iniciar sesión para crear un nuevo blog"

-msgid "Create blog"
-msgstr "Crear el blog"
+# src/routes/blogs.rs:136
+msgid "You are not allowed to delete this blog."
+msgstr ""

-msgid "Comment \"{0}\""
-msgstr "Comentario \"{0}\""
+msgid "You need to be logged in order to like a post"
+msgstr "Necesitas iniciar sesión para gustar una publicación"

-msgid "Content"
-msgstr "Contenido"
+msgid "You need to be logged in order to see your notifications"
+msgstr "Necesitas iniciar sesión para ver tus notificaciones"

-msgid "Submit comment"
-msgstr "Enviar comentario"
+msgid "This post isn't published yet."
+msgstr ""

-msgid "Something broke on our side."
+msgid "You need to be logged in order to write a new post"
+msgstr "Necesitas iniciar sesión para publicar una publicación"
+
+msgid "You are not author in this blog."
 msgstr ""

-msgid "Sorry about that. If you think this is a bug, please report it."
+msgid "New post"
+msgstr "Nueva publicación"
+
+msgid "Edit {0}"
 msgstr ""
-"Disculpe la molestia. Si cree que esto es un defecto, por favor repórtalo."

-msgid "Configuration"
-msgstr "Configuración"
+#, fuzzy
+msgid "You need to be logged in order to reshare a post"
+msgstr "Necesitas iniciar sesión para gustar una publicación"

-msgid "Configure your instance"
-msgstr "Configure su instancia"
+msgid "You need to be logged in order to access your dashboard"
+msgstr ""

-msgid "Name"
-msgstr "Nombre"
+#, fuzzy
+msgid "You need to be logged in order to subscribe to someone"
+msgstr "Necesitas iniciar sesión para seguir a alguien"

-msgid "Let&#x27;s go!"
-msgstr "Vamos!"
+msgid "You need to be logged in order to edit your profile"
+msgstr "Necesitas iniciar sesión para poder editar tu peril"

-msgid "Welcome to {0}"
-msgstr "Bienvenido(a) a {0}"
+msgid "Plume"
+msgstr "Plume"
+
+msgid "Menu"
+msgstr "Menú"
+
+msgid "Search"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""

 msgid "Notifications"
 msgstr "Notificaciones"

-msgid "Written by {0}"
-msgstr "Escrito por {0}"
+msgid "Log Out"
+msgstr "Cerrar Sesión"

-msgid "This article is under the {0} license."
-msgstr "Este artículo está bajo la licencia {0}."
+msgid "My account"
+msgstr "Mi cuenta"

-msgid "One like"
-msgid_plural "{0} likes"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Log In"
+msgstr "Iniciar Sesión"

-msgid "I don&#x27;t like this anymore"
-msgstr "Ya no me gusta"
+msgid "Register"
+msgstr "Registrar"

-msgid "Add yours"
-msgstr "Agregue el suyo"
+msgid "About this instance"
+msgstr ""

-msgid "One Boost"
-msgid_plural "{0} Boosts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Source code"
+msgstr ""

-msgid "I don&#x27;t want to boost this anymore"
+msgid "Matrix room"
 msgstr ""

-msgid "Boost"
+msgid "Administration"
 msgstr ""

-msgid "Comments"
-msgstr "Comentários"
+#, fuzzy
+msgid "Welcome on {}"
+msgstr "Bienvenido(a) a {0}"

-msgid "Respond"
-msgstr "Responder"
+msgid "Latest articles"
+msgstr "Últimas publicaciones"
+
+msgid "Your feed"
+msgstr ""

-msgid "Comment"
-msgstr "Comentar"
+msgid "Federated feed"
+msgstr ""

-msgid "New post"
-msgstr "Nueva publicación"
+msgid "Local feed"
+msgstr ""

-msgid "Create a post"
-msgstr "Crear una publicación"
+msgid "Administration of {0}"
+msgstr ""

-msgid "Publish"
-msgstr "Publicar"
+msgid "Instances"
+msgstr ""

-msgid "Login"
-msgstr "Iniciar Sesión"
+msgid "Configuration"
+msgstr "Configuración"

-msgid "Username or email"
-msgstr "Nombre de usuario o correo electrónico"
+msgid "Users"
+msgstr ""

-msgid "Password"
-msgstr "Contraseña"
+msgid "Unblock"
+msgstr ""

-msgid "Dashboard"
+msgid "Block"
 msgstr ""

-msgid "Your Dashboard"
+msgid "Ban"
 msgstr ""

-msgid "Your Blogs"
-msgstr "Tus blogs"
+msgid "All the articles of the Fediverse"
+msgstr ""

-msgid "You don&#x27;t have any blog yet. Create your own, or ask to join one."
-msgstr "Aun no tienes un blog. Crea o pide unirte a uno."
+msgid "Articles from {}"
+msgstr ""

-msgid "Start a new blog"
-msgstr "Iniciar un nuevo blog"
+msgid "Nothing to see here yet. Try to subscribe to more people."
+msgstr ""

-msgid "Admin"
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Optional"
 msgstr ""

-msgid "It is you"
-msgstr "Eres tú"
+msgid "Allow anyone to register here"
+msgstr ""

-msgid "Edit your profile"
-msgstr "Edita tu perfil"
+msgid "Short description - byline"
+msgstr ""

-msgid "Open on {0}"
-msgstr "Abrir en {0}"
+msgid "Markdown syntax is supported"
+msgstr ""

-msgid "Follow"
-msgstr "Seguir"
+msgid "Long description"
+msgstr ""

-msgid "Unfollow"
-msgstr "Dejar de seguir"
+# src/template_utils.rs:144
+msgid "Default article license"
+msgstr ""

-msgid "Recently boosted"
+msgid "Save these settings"
+msgstr ""
+
+msgid "About {0}"
+msgstr ""
+
+msgid "Home to <em>{0}</em> users"
+msgstr ""
+
+msgid "Who wrote <em>{0}</em> articles"
 msgstr ""

-msgid "One follower"
-msgid_plural "{0} followers"
-msgstr[0] "Un seguidor"
-msgstr[1] "{0} seguidores"
+msgid "And connected to <em>{0}</em> other instances"
+msgstr ""
+
+msgid "Administred by"
+msgstr ""
+
+msgid "Runs Plume {0}"
+msgstr ""

 msgid "Edit your account"
 msgstr "Edita tu cuenta"
@ -172,7 +213,8 @@ msgstr "Edita tu cuenta"
 msgid "Your Profile"
 msgstr "Tu perfil"

-msgid "Display Name"
+# src/template_utils.rs:144
+msgid "Display name"
 msgstr ""

 msgid "Email"
@ -184,403 +226,485 @@ msgstr "Resumen"
 msgid "Update account"
 msgstr "Actualizar cuenta"

-msgid "{0}'s followers"
-msgstr "Los seguidores de {0}"
-
-msgid "Followers"
-msgstr "Seguidores"
-
-msgid "New Account"
-msgstr "Nueva cuenta"
+msgid "Danger zone"
+msgstr ""

-msgid "Create an account"
-msgstr "Crear una cuenta"
+msgid "Be very careful, any action taken here can't be cancelled."
+msgstr ""

-msgid "Username"
-msgstr "Nombre de usuario"
+msgid "Delete your account"
+msgstr ""

-msgid "Password confirmation"
-msgstr "Confirmación de contraseña"
+msgid "Sorry, but as an admin, you can't leave your own instance."
+msgstr ""

-msgid "Create account"
-msgstr "Crea una cuenta"
+msgid "Your Dashboard"
+msgstr ""

-msgid "Plume"
-msgstr "Plume"
+msgid "Your Blogs"
+msgstr "Tus blogs"

-msgid "Menu"
-msgstr "Menú"
+#, fuzzy
+msgid "You don't have any blog yet. Create your own, or ask to join one."
+msgstr "Aun no tienes un blog. Crea o pide unirte a uno."

-msgid "My account"
-msgstr "Mi cuenta"
+msgid "Start a new blog"
+msgstr "Iniciar un nuevo blog"

-msgid "Log Out"
-msgstr "Cerrar Sesión"
+msgid "Your Drafts"
+msgstr ""

-msgid "Log In"
-msgstr "Iniciar Sesión"
+msgid "Your media"
+msgstr ""

-msgid "Register"
-msgstr "Registrar"
+msgid "Go to your gallery"
+msgstr ""

-msgid "You need to be logged in order to create a new blog"
-msgstr "Necesitas iniciar sesión para crear un nuevo blog"
+msgid "Create your account"
+msgstr ""

-msgid "You need to be logged in order to post a comment"
-msgstr "Necesitas iniciar sesión para publicar un comentario"
+msgid "Create an account"
+msgstr "Crear una cuenta"

-msgid "You need to be logged in order to like a post"
-msgstr "Necesitas iniciar sesión para gustar una publicación"
+msgid "Username"
+msgstr "Nombre de usuario"

-msgid "You need to be logged in order to see your notifications"
-msgstr "Necesitas iniciar sesión para ver tus notificaciones"
+msgid "Password"
+msgstr "Contraseña"

-msgid "You need to be logged in order to write a new post"
-msgstr "Necesitas iniciar sesión para publicar una publicación"
+msgid "Password confirmation"
+msgstr "Confirmación de contraseña"

-msgid "You need to be logged in order to boost a post"
+msgid ""
+"Apologies, but registrations are closed on this particular instance. You "
+"can, however, find a different one."
 msgstr ""

-msgid "Invalid username or password"
+msgid "Articles"
 msgstr ""

-msgid "You need to be logged in order to access your dashboard"
+msgid "Subscribers"
 msgstr ""

-msgid "You need to be logged in order to follow someone"
-msgstr "Necesitas iniciar sesión para seguir a alguien"
+msgid "Subscriptions"
+msgstr ""

-msgid "You need to be logged in order to edit your profile"
-msgstr "Necesitas iniciar sesión para poder editar tu peril"
+msgid "Atom feed"
+msgstr ""

-#, fuzzy
-msgid "By {0}"
-msgstr "Por"
+msgid "Recently boosted"
+msgstr ""

-msgid "{0} boosted your article"
+msgid "Admin"
 msgstr ""

-msgid "{0} started following you"
-msgstr "{0} comenzó a seguirte"
+msgid "It is you"
+msgstr "Eres tú"

-msgid "{0} liked your article"
-msgstr "{0} gusto tu publicación"
+msgid "Edit your profile"
+msgstr "Edita tu perfil"

-msgid "{0} commented your article"
-msgstr ""
+msgid "Open on {0}"
+msgstr "Abrir en {0}"

-msgid "We couldn&#x27;t find this page."
+msgid "Unsubscribe"
 msgstr ""

-msgid "The link that led you here may be broken."
+msgid "Subscribe"
 msgstr ""

-msgid "You are not authorized."
+msgid "{0}'s subscriptions'"
 msgstr ""

-msgid "You are not author in this blog."
+msgid "{0}'s subscribers"
 msgstr ""

-msgid "{0} mentioned you."
-msgstr ""
+msgid "Respond"
+msgstr "Responder"

-msgid "Your comment"
+msgid "Delete this comment"
 msgstr ""

-msgid "Unknown error"
+msgid "What is Plume?"
 msgstr ""

-msgid "Invalid name"
+msgid "Plume is a decentralized blogging engine."
 msgstr ""

-msgid "A blog with the same name already exists."
+msgid "Authors can manage various blogs from an unique website."
 msgstr ""

-msgid "Your comment can't be empty"
+msgid ""
+"Articles are also visible on other Plume websites, and you can interact with "
+"them directly from other platforms like Mastodon."
 msgstr ""

-msgid "A post with the same title already exists."
+msgid "Home to <em>{0}</em> people"
 msgstr ""

-msgid "We need an email or a username to identify you"
+msgid "Read the detailed rules"
 msgstr ""

-msgid "Your password can't be empty"
+msgid "View all"
 msgstr ""

-msgid "Passwords are not matching"
+#, fuzzy
+msgid "By {0}"
+msgstr "Por"
+
+msgid "Draft"
 msgstr ""

-msgid "Username can't be empty"
+msgid "Your query"
 msgstr ""

-msgid "Invalid email"
+msgid "Advanced search"
 msgstr ""

-msgid "Password should be at least 8 characters long"
+# src/template_utils.rs:185
+msgid "Article title matching these words"
 msgstr ""

-msgid "One author in this blog: "
-msgid_plural "{0} authors in this blog: "
-msgstr[0] ""
-msgstr[1] ""
+msgid "Title"
+msgstr "Título"

-msgid "Login or use your Fediverse account to interact with this article"
+# src/template_utils.rs:185
+msgid "Subtitle matching these words"
 msgstr ""

-msgid "Optional"
+msgid "Subtitle - byline"
 msgstr ""

-msgid "One article in this blog"
-msgid_plural "{0} articles in this blog"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Previous page"
+# src/template_utils.rs:185
+msgid "Content matching these words"
 msgstr ""

-msgid "Next page"
-msgstr ""
+#, fuzzy
+msgid "Body content"
+msgstr "Contenido"

-msgid "Source code"
+# src/template_utils.rs:185
+msgid "From this date"
 msgstr ""

-msgid "Matrix room"
+# src/template_utils.rs:185
+msgid "To this date"
 msgstr ""

-msgid "Administration"
+# src/template_utils.rs:185
+msgid "Containing these tags"
 msgstr ""

-msgid "Instance settings"
+msgid "Tags"
 msgstr ""

-msgid "Allow anyone to register"
+# src/template_utils.rs:185
+msgid "Posted on one of these instances"
 msgstr ""

-msgid "Short description"
+msgid "Instance domain"
 msgstr ""

-msgid "Markdown is supported"
+# src/template_utils.rs:185
+msgid "Posted by one of these authors"
 msgstr ""

-msgid "Long description"
+msgid "Authors"
 msgstr ""

-msgid "Default license"
+# src/template_utils.rs:185
+msgid "Posted on one of these blogs"
 msgstr ""

-msgid "Save settings"
+msgid "Blog title"
 msgstr ""

-msgid "No comments yet. Be the first to react!"
+# src/template_utils.rs:185
+msgid "Written in this language"
 msgstr ""

-msgid "About this instance"
+msgid "Language"
 msgstr ""

-msgid "What is Plume?"
-msgstr ""
+#, fuzzy
+msgid "Published under this license"
+msgstr "Este artículo está bajo la licencia {0}."

-msgid "Plume is a decentralized blogging engine."
+msgid "Article license"
 msgstr ""

-msgid "Authors can manage various blogs from an unique website."
+msgid "Search result for \"{0}\""
 msgstr ""

-msgid "Articles are also visible on other Plume websites, and you can interact with them directly from other platforms like Mastodon."
+msgid "Search result"
 msgstr ""

-msgid "Create your account"
+msgid "No result for your query"
 msgstr ""

-msgid "About {0}"
+msgid "No more result for your query"
 msgstr ""

-msgid "Home to <em>{0}</em> users"
-msgstr ""
+msgid "Login"
+msgstr "Iniciar Sesión"

-msgid "Who wrote <em>{0}</em> articles"
-msgstr ""
+msgid "Username or email"
+msgstr "Nombre de usuario o correo electrónico"

-msgid "And connected to <em>{0}</em> other instances"
+msgid "Subtitle"
 msgstr ""

-msgid "Read the detailed rules"
-msgstr ""
+msgid "Content"
+msgstr "Contenido"

-msgid "Delete this article"
+# src/template_utils.rs:144
+msgid "Tags, separated by commas"
 msgstr ""

-msgid "Delete this blog"
+# src/template_utils.rs:144
+msgid "License"
 msgstr ""

-msgid "Administred by"
+# src/template_utils.rs:148
+msgid "Leave it empty to reserve all rights"
 msgstr ""

-msgid "Runs Plume {0}"
+msgid "Illustration"
 msgstr ""

-msgid "Your media"
+msgid "None"
 msgstr ""

-msgid "Go to your gallery"
+msgid "This is a draft, don't publish it yet."
 msgstr ""

-msgid "{0}'s avatar'"
+msgid "Update"
 msgstr ""

-msgid "Media details"
+msgid "Update, or publish"
 msgstr ""

-msgid "Go back to the gallery"
+msgid "Publish your post"
 msgstr ""

-msgid "Markdown code"
-msgstr ""
+msgid "Written by {0}"
+msgstr "Escrito por {0}"

-msgid "Copy it in your articles to insert this media."
+msgid "Edit"
 msgstr ""

-msgid "Use as avatar"
+msgid "Delete this article"
 msgstr ""

-msgid "Delete"
+msgid "All rights reserved."
 msgstr ""

-msgid "Upload"
-msgstr ""
+msgid "This article is under the {0} license."
+msgstr "Este artículo está bajo la licencia {0}."

-msgid "You don't have any media yet."
-msgstr ""
+msgid "One like"
+msgid_plural "{0} likes"
+msgstr[0] ""
+msgstr[1] ""

-msgid "Media upload"
+#, fuzzy
+msgid "I don't like this anymore"
+msgstr "Ya no me gusta"
+
+msgid "Add yours"
+msgstr "Agregue el suyo"
+
+msgid "One boost"
+msgid_plural "{0} boost"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+msgid "I don't want to boost this anymore"
+msgstr "Ya no me gusta"
+
+msgid "Boost"
 msgstr ""

-msgid "Description"
+msgid "Login or use your Fediverse account to interact with this article"
 msgstr ""

+msgid "Comments"
+msgstr "Comentários"
+
 msgid "Content warning"
 msgstr ""

-msgid "File"
+msgid "Your comment"
 msgstr ""

-msgid "Send"
-msgstr ""
+msgid "Submit comment"
+msgstr "Enviar comentario"

-msgid "Sorry, but registrations are closed on this instance. Try to find another one"
+msgid "No comments yet. Be the first to react!"
 msgstr ""

-msgid "Subtitle"
+msgid "Invalid CSRF token"
 msgstr ""

-msgid "Login to like"
+msgid ""
+"Something is wrong with your CSRF token. Make sure cookies are enabled in "
+"you browser, and try reloading this page. If you continue to see this error "
+"message, please report it."
 msgstr ""

-msgid "Login to boost"
+msgid "Page not found"
 msgstr ""

-msgid "Your feed"
+msgid "We couldn't find this page."
 msgstr ""

-msgid "Federated feed"
+msgid "The link that led you here may be broken."
 msgstr ""

-msgid "Local feed"
+msgid "The content you sent can't be processed."
 msgstr ""

-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Maybe it was too long."
 msgstr ""

-msgid "Articles"
+msgid "You are not authorized."
 msgstr ""

-msgid "All the articles of the Fediverse"
+msgid "Internal server error"
 msgstr ""

-msgid "Articles from {0}"
+msgid "Something broke on our side."
 msgstr ""

-msgid "View all"
+msgid "Sorry about that. If you think this is a bug, please report it."
 msgstr ""
+"Disculpe la molestia. Si cree que esto es un defecto, por favor repórtalo."

-msgid "Articles tagged \"{0}\""
-msgstr ""
+#, fuzzy
+msgid "New Blog"
+msgstr "Nuevo blog"

-msgid "Edit"
-msgstr ""
+msgid "Create a blog"
+msgstr "Crear un blog"

-msgid "Edit {0}"
-msgstr ""
+msgid "Create blog"
+msgstr "Crear el blog"

-msgid "Update"
-msgstr ""
+msgid "There's one author on this blog: "
+msgid_plural "There are {0} authors on this blog: "
+msgstr[0] ""
+msgstr[1] ""

-msgid "We couldn't find this page."
-msgstr ""
+msgid "There's one article on this blog"
+msgid_plural "There are {0} articles on this blog"
+msgstr[0] ""
+msgstr[1] ""

-msgid "Invalid CSRF token."
-msgstr ""
+#, fuzzy
+msgid "No posts to see here yet."
+msgstr "No hay publicaciones para ver aquí ahora."

-msgid "Something is wrong with your CSRF token. Make sure cookies are enabled in you browser, and try reloading this page. If you continue to see this error message, please report it."
-msgstr ""
+msgid "New article"
+msgstr "Nueva publicación"

-msgid "Administration of {0}"
+msgid "Be very careful, any action taken here can't be reversed."
 msgstr ""

-msgid "Instances"
+msgid "Permanently delete this blog"
 msgstr ""

-msgid "Unblock"
+msgid "Articles tagged \"{0}\""
 msgstr ""

-msgid "Block"
+msgid "There are currently no articles with such a tag"
 msgstr ""

-msgid "Ban"
+msgid "Upload"
 msgstr ""

-msgid "Useful for visually impaired people and licensing"
+msgid "You don't have any media yet."
 msgstr ""

-msgid "Let it empty if there is none"
+msgid "Delete"
 msgstr ""

-msgid "Draft"
+msgid "Media upload"
 msgstr ""

-msgid "This is a draft, don't publish it yet."
+msgid "Description"
 msgstr ""

-msgid "Update or publish"
+msgid "Useful for visually impaired people, as well as licensing information"
 msgstr ""

-msgid "Your Drafts"
+msgid "Leave it empty, if none is needed"
 msgstr ""

-msgid "Danger zone"
+msgid "File"
 msgstr ""

-msgid "Be very careful, any action taken here can't be cancelled."
+msgid "Send"
 msgstr ""

-msgid "Delete your account"
+msgid "Media details"
 msgstr ""

-msgid "Sorry, but as an admin, you can't leave your instance."
+msgid "Go back to the gallery"
 msgstr ""

-msgid "Users"
+msgid "Markdown syntax"
 msgstr ""

-msgid "This post isn't published yet."
+msgid "Copy it into your articles, to insert this media:"
 msgstr ""

-msgid "There is currently no article with that tag"
+msgid "Use as avatar"
 msgstr ""

-msgid "Illustration"
-msgstr ""
+#~ msgid "Comment \"{0}\""
+#~ msgstr "Comentario \"{0}\""

-msgid "None"
-msgstr ""
+#~ msgid "Configure your instance"
+#~ msgstr "Configure su instancia"
+
+#~ msgid "Let&#x27;s go!"
+#~ msgstr "Vamos!"
+
+#~ msgid "Comment"
+#~ msgstr "Comentar"
+
+#~ msgid "Create a post"
+#~ msgstr "Crear una publicación"
+
+#~ msgid "Publish"
+#~ msgstr "Publicar"
+
+#~ msgid "Follow"
+#~ msgstr "Seguir"
+
+#~ msgid "Unfollow"
+#~ msgstr "Dejar de seguir"
+
+#~ msgid "One follower"
+#~ msgid_plural "{0} followers"
+#~ msgstr[0] "Un seguidor"
+#~ msgstr[1] "{0} seguidores"
+
+#~ msgid "{0}'s followers"
+#~ msgstr "Los seguidores de {0}"
+
+#~ msgid "Followers"
+#~ msgstr "Seguidores"
+
+#~ msgid "New Account"
+#~ msgstr "Nueva cuenta"
+
+#~ msgid "Create account"
+#~ msgstr "Crea una cuenta"
+
+#~ msgid "You need to be logged in order to post a comment"
+#~ msgstr "Necesitas iniciar sesión para publicar un comentario"
+
+#~ msgid "{0} started following you"
+#~ msgstr "{0} comenzó a seguirte"
--- a/po/plume/fr.po
+++ b/po/plume/fr.po
@ -21,7 +21,7 @@ msgid "{0} commented your article."
 msgstr "{0} a commenté votre article"

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 #, fuzzy
@ -81,7 +81,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr "Vous devez vous connecter pour accéder à votre tableau de bord"

 #, fuzzy
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Vous devez vous connecter pour suivre quelqu’un"

 #, fuzzy
@ -173,7 +173,7 @@ msgid "Articles from {}"
 msgstr "Articles de {0}"

 #, fuzzy
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "Rien par ici pour le moment. Essayez de suivre plus de monde."

 msgid "Name"
@ -313,8 +313,12 @@ msgstr ""
 msgid "Articles"
 msgstr "Articles"

-msgid "Followers"
-msgstr "Abonné⋅e⋅s"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Description"

 #, fuzzy
 msgid "Atom feed"
@ -336,15 +340,19 @@ msgstr "Modifier votre profil"
 msgid "Open on {0}"
 msgstr ""

-#, fuzzy
-msgid "Unfollow"
-msgstr "S’abonner"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "S’abonner"
+msgid "Subscribe"
+msgstr ""

-msgid "{0}'s followers"
-msgstr "Abonné⋅e⋅s de {0}"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "Description"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Description"

 msgid "Respond"
 msgstr "Répondre"
@ -718,6 +726,25 @@ msgstr "Copiez-le dans vos articles pour insérer ce média."
 msgid "Use as avatar"
 msgstr "Utiliser comme avatar"

+#~ msgid "{0}'s followers"
+#~ msgstr "Abonné⋅e⋅s de {0}"
+
+#~ msgid "People {0} follows"
+#~ msgstr "Personnes suivies par {0}"
+
+#~ msgid "Followers"
+#~ msgstr "Abonné⋅e⋅s"
+
+#~ msgid "Followed"
+#~ msgstr "Suivi⋅e⋅s"
+
+#, fuzzy
+#~ msgid "Unfollow"
+#~ msgstr "S’abonner"
+
+#~ msgid "Follow"
+#~ msgstr "S’abonner"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Aucun article pour le moment."
--- a/po/plume/gl.po
+++ b/po/plume/gl.po
@ -17,7 +17,7 @@ msgid "{0} commented your article."
 msgstr "{0} comentou o seu artigo"

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 #, fuzzy
@ -78,7 +78,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr "Debe estar conectada para acceder ao seu taboleiro"

 #, fuzzy
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Debe estar conectada para seguir a alguén"

 #, fuzzy
@ -174,7 +174,7 @@ msgid "Articles from {}"
 msgstr "Artigos desde {0}"

 #, fuzzy
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "Nada que ler por aquí. Intente seguir a máis xente."

 msgid "Name"
@ -309,8 +309,12 @@ msgstr ""
 msgid "Articles"
 msgstr "Artigos"

-msgid "Followers"
-msgstr "Seguidoras"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Descrición"

 #, fuzzy
 msgid "Atom feed"
@ -332,16 +336,19 @@ msgstr "Edite o seu perfil"
 msgid "Open on {0}"
 msgstr ""

-#, fuzzy
-msgid "Unfollow"
-msgstr "Seguir"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "Seguir"
+msgid "Subscribe"
+msgstr ""

 #, fuzzy
-msgid "{0}'s followers"
-msgstr "Unha seguidora"
+msgid "{0}'s subscriptions'"
+msgstr "Descrición"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Descrición"

 msgid "Respond"
 msgstr "Respostar"
@ -715,6 +722,28 @@ msgstr "Copie para incrustar este contido nos seus artigos"
 msgid "Use as avatar"
 msgstr "Utilizar como avatar"

+#, fuzzy
+#~ msgid "{0}'s followers"
+#~ msgstr "Unha seguidora"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "Unha seguidora"
+
+#~ msgid "Followers"
+#~ msgstr "Seguidoras"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "Seguir"
+
+#, fuzzy
+#~ msgid "Unfollow"
+#~ msgstr "Seguir"
+
+#~ msgid "Follow"
+#~ msgstr "Seguir"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Aínda non hai entradas publicadas"
--- a/po/plume/it.po
+++ b/po/plume/it.po
@ -17,7 +17,7 @@ msgid "{0} commented your article."
 msgstr "{0} ha commentato il tuo articolo"

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 #, fuzzy
@ -78,7 +78,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr "Devi effettuare l'accesso per accedere al tuo pannello"

 #, fuzzy
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Devi effettuare l'accesso per seguire qualcuno"

 #, fuzzy
@ -174,7 +174,7 @@ msgid "Articles from {}"
 msgstr "Articoli da {0}}"

 #, fuzzy
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "Non c'è niente da mostrare qui. Prova a seguire più persone."

 msgid "Name"
@ -312,8 +312,12 @@ msgstr ""
 msgid "Articles"
 msgstr "Articoli"

-msgid "Followers"
-msgstr "Seguaci"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Descrizione"

 #, fuzzy
 msgid "Atom feed"
@ -335,16 +339,19 @@ msgstr "Modifica il tuo profilo"
 msgid "Open on {0}"
 msgstr ""

-#, fuzzy
-msgid "Unfollow"
-msgstr "Segui"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "Segui"
+msgid "Subscribe"
+msgstr ""

 #, fuzzy
-msgid "{0}'s followers"
-msgstr "Uno ti segue"
+msgid "{0}'s subscriptions'"
+msgstr "Descrizione"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Descrizione"

 msgid "Respond"
 msgstr "Rispondi"
@ -722,6 +729,28 @@ msgstr "Copialo nei tuoi articoli per inserire questo media."
 msgid "Use as avatar"
 msgstr "Usa come avatar"

+#, fuzzy
+#~ msgid "{0}'s followers"
+#~ msgstr "Uno ti segue"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "Uno ti segue"
+
+#~ msgid "Followers"
+#~ msgstr "Seguaci"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "Segui"
+
+#, fuzzy
+#~ msgid "Unfollow"
+#~ msgstr "Segui"
+
+#~ msgid "Follow"
+#~ msgstr "Segui"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Nessun post da mostrare qui."
--- a/po/plume/ja.po
+++ b/po/plume/ja.po
@ -18,9 +18,9 @@ msgstr ""
 msgid "{0} commented your article."
 msgstr "{{ data }} があなたの記事にコメントしました"

-#, fuzzy
-msgid "{0} is now following you."
-msgstr "{{ user }} はあなたをフォローしています。"
+# src/template_utils.rs:35
+msgid "{0} is subscribed to you."
+msgstr ""

 #, fuzzy
 msgid "{0} liked your article."
@ -74,7 +74,8 @@ msgstr "投稿をいいねするにはログインする必要があります"
 msgid "You need to be logged in order to access your dashboard"
 msgstr "ダッシュボードにアクセスするにはログインする必要があります"

-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "他の人をフォローするにはログインする必要があります"

 msgid "You need to be logged in order to edit your profile"
@ -163,7 +164,8 @@ msgstr "Fediverse のすべての記事"
 msgid "Articles from {}"
 msgstr "{{ instance.name }} の記事"

-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr ""
 "ここにはまだ表示できるものがありません。他の人をもっとフォローしてみてくださ"
 "い。"
@ -298,8 +300,12 @@ msgstr ""
 msgid "Articles"
 msgstr "記事"

-msgid "Followers"
-msgstr "フォロワー"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "説明"

 #, fuzzy
 msgid "Atom feed"
@ -320,15 +326,19 @@ msgstr "自分のプロフィールを編集"
 msgid "Open on {0}"
 msgstr ""

-msgid "Unfollow"
-msgstr "フォロー解除"
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Subscribe"
+msgstr ""

-msgid "Follow"
-msgstr "フォロー"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "説明"

 #, fuzzy
-msgid "{0}'s followers"
-msgstr "{{ count }} フォロワー"
+msgid "{0}'s subscribers"
+msgstr "説明"

 msgid "Respond"
 msgstr "返信"
@ -693,6 +703,30 @@ msgstr "このメディアを記事に挿入するには、自分の記事にコ
 msgid "Use as avatar"
 msgstr "アバターとして使う"

+#~ msgid "{0}'s followers"
+#~ msgstr "{{ count }} フォロワー"
+
+#, fuzzy
+#~ msgid "{0} is now following you."
+#~ msgstr "{{ user }} はあなたをフォローしています。"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "{0} さんのフォロワー"
+
+#~ msgid "Followers"
+#~ msgstr "フォロワー"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "フォロー"
+
+#~ msgid "Unfollow"
+#~ msgstr "フォロー解除"
+
+#~ msgid "Follow"
+#~ msgstr "フォロー"
+
 #, fuzzy
 #~ msgid "Comment \"{0}\""
 #~ msgstr "\"{{ post }}\" にコメント"
--- a/po/plume/nb.po
+++ b/po/plume/nb.po
@ -18,9 +18,9 @@ msgstr ""
 msgid "{0} commented your article."
 msgstr "{0} la inn en kommentar til artikkelen din"

-#, fuzzy
-msgid "{0} is now following you."
-msgstr "{0} har begynt å følge deg"
+# src/template_utils.rs:35
+msgid "{0} is subscribed to you."
+msgstr ""

 #, fuzzy
 msgid "{0} liked your article."
@ -81,7 +81,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr "Du må være logget inn for å redigere profilen din"

 #, fuzzy
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Du må være logget inn for å følge noen"

 #, fuzzy
@ -177,7 +177,7 @@ msgstr ""
 msgid "Articles from {}"
 msgstr "Om {0}"

-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr ""

 # src/template_utils.rs:144
@ -314,8 +314,12 @@ msgstr ""
 msgid "Articles"
 msgstr "artikler"

-msgid "Followers"
-msgstr "Følgere"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Lang beskrivelse"

 #, fuzzy
 msgid "Atom feed"
@ -338,15 +342,19 @@ msgstr "Din profil"
 msgid "Open on {0}"
 msgstr ""

-msgid "Unfollow"
-msgstr "Slutt å følge"
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Subscribe"
+msgstr ""

-msgid "Follow"
-msgstr "Følg"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "Lang beskrivelse"

 #, fuzzy
-msgid "{0}'s followers"
-msgstr "Én følger"
+msgid "{0}'s subscribers"
+msgstr "Lang beskrivelse"

 msgid "Respond"
 msgstr "Svar"
@ -732,6 +740,31 @@ msgstr ""
 msgid "Use as avatar"
 msgstr ""

+#, fuzzy
+#~ msgid "{0}'s followers"
+#~ msgstr "Én følger"
+
+#, fuzzy
+#~ msgid "{0} is now following you."
+#~ msgstr "{0} har begynt å følge deg"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "Én følger"
+
+#~ msgid "Followers"
+#~ msgstr "Følgere"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "Følg"
+
+#~ msgid "Unfollow"
+#~ msgstr "Slutt å følge"
+
+#~ msgid "Follow"
+#~ msgstr "Følg"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Ingen innlegg å vise enda."
--- a/po/plume/pl.po
+++ b/po/plume/pl.po
@ -18,8 +18,8 @@ msgid "{0} commented your article."
 msgstr "{0} skomentował(a) Twój artykuł."

 # src/template_utils.rs:35
-msgid "{0} is now following you."
-msgstr "{0} zaczął(-eła) Cię obserwować."
+msgid "{0} is subscribed to you."
+msgstr ""

 msgid "{0} liked your article."
 msgstr "{0} polubił(a) Twój artykuł."
@ -66,7 +66,8 @@ msgstr "Musisz się zalogować, aby udostępnić wpis"
 msgid "You need to be logged in order to access your dashboard"
 msgstr "Musisz się zalogować, aby uzyskać dostęp do panelu"

-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Musisz się zalogować, aby zacząć obserwować innych"

 msgid "You need to be logged in order to edit your profile"
@ -153,7 +154,8 @@ msgstr "Wszystkie artykuły w Fediwersum"
 msgid "Articles from {}"
 msgstr "Artykuły z {}"

-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "Nie ma tutaj niczego. Spróbuj zacząć śledzić więcej osób."

 msgid "Name"
@ -276,9 +278,14 @@ msgstr ""
 msgid "Articles"
 msgstr "Artykuły"

-msgid "Followers"
-msgstr "Śledzący"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Opis"

+#, fuzzy
 msgid "Atom feed"
 msgstr "Strumień Atom"

@ -297,14 +304,19 @@ msgstr "Edytuj swój profil"
 msgid "Open on {0}"
 msgstr "Otwórz w {0}"

-msgid "Unfollow"
-msgstr "Przestań obserwować"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "Obserwuj"
+msgid "Subscribe"
+msgstr ""

-msgid "{0}'s followers"
-msgstr "Obserwujący {0}"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "Opis"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Opis"

 msgid "Respond"
 msgstr "Odpowiedz"
@ -658,6 +670,30 @@ msgstr "Skopiuj do swoich artykułów, aby wstawić tę zawartość multimedialn
 msgid "Use as avatar"
 msgstr "Użyj jako awataru"

+#~ msgid "{0}'s followers"
+#~ msgstr "Obserwujący {0}"
+
+# src/template_utils.rs:35
+#~ msgid "{0} is now following you."
+#~ msgstr "{0} zaczął(-eła) Cię obserwować."
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "Obserwujący {0}"
+
+#~ msgid "Followers"
+#~ msgstr "Śledzący"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "Śledzący"
+
+#~ msgid "Unfollow"
+#~ msgstr "Przestań obserwować"
+
+#~ msgid "Follow"
+#~ msgstr "Obserwuj"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Brak wpisów do wyświetlenia."
--- a/po/plume/plume.pot
+++ b/po/plume/plume.pot
@ -17,7 +17,7 @@ msgid "{0} commented your article."
 msgstr ""

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 # src/template_utils.rs:36
@ -81,10 +81,10 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr ""

 # src/routes/user.rs:164
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr ""

-# src/routes/user.rs:227
+# src/routes/user.rs:245
 msgid "You need to be logged in order to edit your profile"
 msgstr ""

@ -169,7 +169,7 @@ msgstr ""
 msgid "Articles from {}"
 msgstr ""

-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr ""

 # src/template_utils.rs:144
@ -295,7 +295,10 @@ msgstr ""
 msgid "Articles"
 msgstr ""

-msgid "Followers"
+msgid "Subscribers"
+msgstr ""
+
+msgid "Subscriptions"
 msgstr ""

 msgid "Atom feed"
@ -316,13 +319,16 @@ msgstr ""
 msgid "Open on {0}"
 msgstr ""

-msgid "Unfollow"
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Subscribe"
 msgstr ""

-msgid "Follow"
+msgid "{0}'s subscriptions'"
 msgstr ""

-msgid "{0}'s followers"
+msgid "{0}'s subscribers"
 msgstr ""

 msgid "Respond"
--- a/po/plume/pt.po
+++ b/po/plume/pt.po
@ -18,9 +18,9 @@ msgstr ""
 msgid "{0} commented your article."
 msgstr "{0} comentou o seu artigo"

-#, fuzzy
-msgid "{0} is now following you."
-msgstr "{0} começou a seguir você"
+# src/template_utils.rs:35
+msgid "{0} is subscribed to you."
+msgstr ""

 #, fuzzy
 msgid "{0} liked your article."
@ -72,7 +72,8 @@ msgstr "Você precisa estar logado para gostar de um post"
 msgid "You need to be logged in order to access your dashboard"
 msgstr "Você precisa estar autenticado para acessar seu painel de controle"

-msgid "You need to be logged in order to follow someone"
+#, fuzzy
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Você precisa estar autenticado para poder seguir alguém"

 msgid "You need to be logged in order to edit your profile"
@ -161,7 +162,8 @@ msgstr "Todos os artigos do Fediverse"
 msgid "Articles from {}"
 msgstr "Artigos de {0}"

-msgid "Nothing to see here yet. Try to follow more people."
+#, fuzzy
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr "Ainda não há nada para ver aqui. Tente seguir mais pessoas."

 msgid "Name"
@ -292,8 +294,12 @@ msgstr ""
 msgid "Articles"
 msgstr "Artigos"

-msgid "Followers"
-msgstr "Seguidores"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Descrição"

 #, fuzzy
 msgid "Atom feed"
@ -314,14 +320,19 @@ msgstr "Editar o seu perfil"
 msgid "Open on {0}"
 msgstr "Abrir em {0}"

-msgid "Unfollow"
-msgstr "Não Seguir"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "Seguir"
+msgid "Subscribe"
+msgstr ""

-msgid "{0}'s followers"
-msgstr "Seguidores de {0}"
+#, fuzzy
+msgid "{0}'s subscriptions'"
+msgstr "Descrição"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Descrição"

 msgid "Respond"
 msgstr "Responder"
@ -683,6 +694,26 @@ msgstr "Copie-o em seus artigos para inserir esta mídia."
 msgid "Use as avatar"
 msgstr "Utilizar como avatar"

+#~ msgid "{0}'s followers"
+#~ msgstr "Seguidores de {0}"
+
+#, fuzzy
+#~ msgid "{0} is now following you."
+#~ msgstr "{0} começou a seguir você"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "Seguidores de {0}"
+
+#~ msgid "Followers"
+#~ msgstr "Seguidores"
+
+#~ msgid "Unfollow"
+#~ msgstr "Não Seguir"
+
+#~ msgid "Follow"
+#~ msgstr "Seguir"
+
 #~ msgid "Comment \"{0}\""
 #~ msgstr "Comentário \"{0}\""

--- a/po/plume/ru.po
+++ b/po/plume/ru.po
@ -19,7 +19,7 @@ msgid "{0} commented your article."
 msgstr "{0} прокомментировал(а) вашу статью"

 # src/template_utils.rs:35
-msgid "{0} is now following you."
+msgid "{0} is subscribed to you."
 msgstr ""

 #, fuzzy
@ -80,7 +80,7 @@ msgid "You need to be logged in order to access your dashboard"
 msgstr "Вы должны войти чтобы получить доступ к вашей панели управления"

 #, fuzzy
-msgid "You need to be logged in order to follow someone"
+msgid "You need to be logged in order to subscribe to someone"
 msgstr "Вы должны войти чтобы подписаться на кого-либо"

 #, fuzzy
@ -178,7 +178,7 @@ msgid "Articles from {}"
 msgstr "Статьи с {0}"

 #, fuzzy
-msgid "Nothing to see here yet. Try to follow more people."
+msgid "Nothing to see here yet. Try to subscribe to more people."
 msgstr ""
 "Пока что здесь ничего нет. Попробуйте подписаться на большее число людей."

@ -316,8 +316,12 @@ msgstr ""
 msgid "Articles"
 msgstr "Статьи"

-msgid "Followers"
-msgstr "Подписчики"
+msgid "Subscribers"
+msgstr ""
+
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Описание"

 #, fuzzy
 msgid "Atom feed"
@ -339,16 +343,19 @@ msgstr "Редактировать ваш профиль"
 msgid "Open on {0}"
 msgstr ""

-#, fuzzy
-msgid "Unfollow"
-msgstr "Подписаться"
+msgid "Unsubscribe"
+msgstr ""

-msgid "Follow"
-msgstr "Подписаться"
+msgid "Subscribe"
+msgstr ""

 #, fuzzy
-msgid "{0}'s followers"
-msgstr "Один подписчик"
+msgid "{0}'s subscriptions'"
+msgstr "Описание"
+
+#, fuzzy
+msgid "{0}'s subscribers"
+msgstr "Описание"

 msgid "Respond"
 msgstr "Ответить"
@ -727,6 +734,28 @@ msgstr ""
 msgid "Use as avatar"
 msgstr "Использовать как аватар"

+#, fuzzy
+#~ msgid "{0}'s followers"
+#~ msgstr "Один подписчик"
+
+#, fuzzy
+#~ msgid "People {0} follows"
+#~ msgstr "Один подписчик"
+
+#~ msgid "Followers"
+#~ msgstr "Подписчики"
+
+#, fuzzy
+#~ msgid "Followed"
+#~ msgstr "Подписаться"
+
+#, fuzzy
+#~ msgid "Unfollow"
+#~ msgstr "Подписаться"
+
+#~ msgid "Follow"
+#~ msgstr "Подписаться"
+
 #, fuzzy
 #~ msgid "No articles to see here yet."
 #~ msgstr "Здесь пока нет постов."
--- a/src/main.rs
+++ b/src/main.rs
@ -54,7 +54,7 @@ use std::process::exit;
 use std::sync::Arc;
 use std::time::Duration;

-init_i18n!("plume", ar, de, en, fr, gl, it, ja, nb, pl, pt, ru);
+init_i18n!("plume", ar, de, en, es, fr, gl, it, ja, nb, pl, pt, ru);

 mod api;
 mod inbox;
@ -187,6 +187,7 @@ Then try to restart Plume.
            routes::user::dashboard,
            routes::user::dashboard_auth,
            routes::user::followers,
+            routes::user::followed,
            routes::user::edit,
            routes::user::edit_auth,
            routes::user::update,
--- a/src/routes/instance.rs
+++ b/src/routes/instance.rs
@ -28,7 +28,7 @@ pub fn index(conn: DbConn, user: Option<User>, intl: I18n) -> Result<Ructe, Erro
    let federated = Post::get_recents_page(&*conn, Page::default().limits())?;
    let local = Post::get_instance_page(&*conn, inst.id, Page::default().limits())?;
    let user_feed = user.clone().and_then(|user| {
-        let followed = user.get_following(&*conn).ok()?;
+        let followed = user.get_followed(&*conn).ok()?;
        let mut in_feed = followed.into_iter().map(|u| u.id).collect::<Vec<i32>>();
        in_feed.push(user.id);
        Post::user_feed_page(&*conn, in_feed, Page::default().limits()).ok()
@ -62,7 +62,7 @@ pub fn local(conn: DbConn, user: Option<User>, page: Option<Page>, intl: I18n) -
 #[get("/feed?<page>")]
 pub fn feed(conn: DbConn, user: User, page: Option<Page>, intl: I18n) -> Result<Ructe, ErrorPage> {
    let page = page.unwrap_or_default();
-    let followed = user.get_following(&*conn)?;
+    let followed = user.get_followed(&*conn)?;
    let mut in_feed = followed.into_iter().map(|u| u.id).collect::<Vec<i32>>();
    in_feed.push(user.id);
    let articles = Post::user_feed_page(&*conn, in_feed, page.limits())?;
--- a/src/routes/user.rs
+++ b/src/routes/user.rs
@ -161,7 +161,7 @@ pub fn follow(name: String, conn: DbConn, user: User, worker: Worker) -> Result<
 #[post("/@/<name>/follow", rank = 2)]
 pub fn follow_auth(name: String, i18n: I18n) -> Flash<Redirect> {
    utils::requires_login(
-        &i18n!(i18n.catalog, "You need to be logged in order to follow someone"),
+        &i18n!(i18n.catalog, "You need to be logged in order to subscribe to someone"),
        uri!(follow: name = name),
    )
 }
@ -184,6 +184,24 @@ pub fn followers(name: String, conn: DbConn, account: Option<User>, page: Option
    )))
 }

+#[get("/@/<name>/followed?<page>", rank = 2)]
+pub fn followed(name: String, conn: DbConn, account: Option<User>, page: Option<Page>, intl: I18n) -> Result<Ructe, ErrorPage> {
+    let page = page.unwrap_or_default();
+    let user = User::find_by_fqn(&*conn, &name)?;
+    let followed_count = user.count_followed(&*conn)?;
+
+    Ok(render!(users::followed(
+        &(&*conn, &intl.catalog, account.clone()),
+        user.clone(),
+        account.and_then(|x| x.is_following(&*conn, user.id).ok()).unwrap_or(false),
+        user.instance_id != Instance::get_local(&*conn)?.id,
+        user.get_instance(&*conn)?.public_domain,
+        user.get_followed_page(&*conn, page.limits())?,
+        page.0,
+        Page::total(followed_count as i32)
+    )))
+}
+
 #[get("/@/<name>", rank = 1)]
 pub fn activity_details(
    name: String,
--- a/src/template_utils.rs
+++ b/src/template_utils.rs
@ -32,7 +32,7 @@ pub fn translate_notification(ctx: BaseContext, notif: Notification) -> String {
    let name = notif.get_actor(ctx.0).unwrap().name(ctx.0);
    match notif.kind.as_ref() {
        notification_kind::COMMENT => i18n!(ctx.1, "{0} commented your article."; &name),
-        notification_kind::FOLLOW => i18n!(ctx.1, "{0} is now following you."; &name),
+        notification_kind::FOLLOW => i18n!(ctx.1, "{0} is subscribed to you."; &name),
        notification_kind::LIKE => i18n!(ctx.1, "{0} liked your article."; &name),
        notification_kind::MENTION => i18n!(ctx.1, "{0} mentioned you."; &name),
        notification_kind::RESHARE => i18n!(ctx.1, "{0} boosted your article."; &name),
--- a/templates/instance/feed.rs.html
+++ b/templates/instance/feed.rs.html
@ -22,7 +22,7 @@
            }
        </div>
    } else {
-        <p class="center">@i18n!(ctx.1, "Nothing to see here yet. Try to follow more people.")</p>
+        <p class="center">@i18n!(ctx.1, "Nothing to see here yet. Try to subscribe to more people.")</p>
    }
    @paginate(ctx.1, page, n_pages)
 })
--- a/templates/posts/details.rs.html
+++ b/templates/posts/details.rs.html
@ -80,7 +80,7 @@
            </div>
 	    @if !ctx.2.as_ref().map(|u| u.id == author.id).unwrap_or(false) {
                <form action="@uri!(user::follow: name = author.get_fqn(ctx.0))" method="POST">
-                    <input type="submit" class="button" value="@if is_following {@i18n!(ctx.1, "Unfollow")} else {@i18n!(ctx.1, "Follow")}">
+                    <input type="submit" class="button" value="@if is_following {@i18n!(ctx.1, "Unsubscribe")} else {@i18n!(ctx.1, "Subscribe")}">
                </form>
 	    }
        </div>
--- a/templates/users/details.rs.html
+++ b/templates/users/details.rs.html
@ -11,7 +11,8 @@

    @tabs(&[
        (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), true),
-        (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Followers"), false)
+        (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscribers"), false),
+        (&uri!(user::followed: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscriptions"), false)
    ])

    @if !recents.is_empty() {
--- a/templates/users/followed.rs.html
+++ b/templates/users/followed.rs.html
@ -0,0 +1,26 @@
+@use templates::{base, users::header};
+@use template_utils::*;
+@use plume_models::users::User;
+@use routes::*;
+
+@(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, followed: Vec<User>, page: i32, n_pages: i32)
+
+@:base(ctx, i18n!(ctx.1, "{0}'s subscriptions'"; user.name(ctx.0)), {}, {}, {
+    @:header(ctx, &user, follows, is_remote, remote_url)
+
+    @tabs(&[
+        (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), true),
+        (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscribers"), false),
+        (&uri!(user::followed: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscriptions"), false)
+    ])
+
+    <div class="cards">
+        @for follow in followed {
+            <div class="card">
+                <h3><a href="@uri!(user::details: name = follow.get_fqn(ctx.0))">@follow.name(ctx.0)</a> <small>@format!("@{}", follow.get_fqn(ctx.0))</small></h3>
+                <main><p>@Html(follow.summary)</p></main>
+            </div>
+        }
+    </div>
+    @paginate(ctx.1, page, n_pages)
+})
--- a/templates/users/followers.rs.html
+++ b/templates/users/followers.rs.html
@ -5,12 +5,13 @@

@(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, followers: Vec<User>, page: i32, n_pages: i32)

-@:base(ctx, i18n!(ctx.1, "{0}'s followers"; user.name(ctx.0)), {}, {}, {
+@:base(ctx, i18n!(ctx.1, "{0}'s subscribers"; user.name(ctx.0)), {}, {}, {
    @:header(ctx, &user, follows, is_remote, remote_url)

    @tabs(&[
-        (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), false),
-        (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Followers"), true)
+        (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), true),
+        (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscribers"), false),
+        (&uri!(user::followed: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscriptions"), false)
    ])

    <div class="cards">
--- a/templates/users/header.rs.html
+++ b/templates/users/header.rs.html
@ -35,9 +35,9 @@
        @if ctx.2.clone().map(|u| u.id != user.id).unwrap_or(false) {
            <form class="inline" method="post" action="@uri!(user::follow: name = user.get_fqn(ctx.0))">
            @if follows {
-                <input type="submit" value="@i18n!(ctx.1, "Unfollow")">
+                <input type="submit" value="@i18n!(ctx.1, "Unsubscribe")">
            } else {
-                <input type="submit" value="@i18n!(ctx.1, "Follow")">
+                <input type="submit" value="@i18n!(ctx.1, "Subscribe")">
            }
            </form>
        }